merge of '73e0f6af6af847cc3dd891302ac04b9cab7c2470'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 17:44:30 +0000 (17:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 17:44:30 +0000 (17:44 +0000)
     and 'c35bb4255861a806a262b725cb19d12b4c906286'


Trivial merge