merge of '14928573b347a6b1c9dbb7c902a5f88108e50372'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 17:07:48 +0000 (17:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Aug 2007 17:07:48 +0000 (17:07 +0000)
     and '52580cee5bed5696a392f8553aaab20b2c6af883'


Trivial merge