merge of 'acd8437858f09a96cbc55521caf58591895661d7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 15:52:54 +0000 (15:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 15:52:54 +0000 (15:52 +0000)
     and 'd131b2a91c76f28316eb023acdc7d81fb7a42044'


Trivial merge