merge of '358ee536bc83b766d3a66b4fa27a3fef5012ace8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Mar 2008 15:13:20 +0000 (15:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Mar 2008 15:13:20 +0000 (15:13 +0000)
     and '769fde4a1014e93e04fd7d91a1626690100f1306'


Trivial merge