merge of '5678fc5f68b2ae8af66e58e2166718c6700e23d9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 18:28:16 +0000 (18:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 18:28:16 +0000 (18:28 +0000)
     and '6d039e9b03aa085fdfe8ca8ffa98cf3b212eabed'


Trivial merge