merge of '5140a55fd62a4e67330c5dc059c8fb7f0b2e4880'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 09:31:11 +0000 (09:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 09:31:11 +0000 (09:31 +0000)
     and '86883da58ec08eb043fd0009b78d8fd54dda214f'


Trivial merge