merge of '43c09a2a2c1a6b190622823b1298024c62058416'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 01:11:29 +0000 (01:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 01:11:29 +0000 (01:11 +0000)
     and 'dc62072795a21ec814639f0740549640b9b471a4'


Trivial merge