merge of '416f841049c84e97f18fad677688af32cbc68636'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 23:17:50 +0000 (23:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 23:17:50 +0000 (23:17 +0000)
     and '8d96efde3687c41c8d5111e4be606b8b0946167d'


Trivial merge