merge of '36099db59bdf61dc5e1f93d3d874817fa38998dd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Dec 2007 11:33:02 +0000 (11:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Dec 2007 11:33:02 +0000 (11:33 +0000)
     and '82049ea686b5481d9f668eb2bd3c82e3782765e3'


Trivial merge