merge of '0a2d2ceb69c74512829d68b0e0a1d8854d70773b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 2 Jul 2008 13:16:46 +0000 (13:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 2 Jul 2008 13:16:46 +0000 (13:16 +0000)
     and '47f50b0caeb4ce0ed68e21f71ad68ae79e309be3'


Trivial merge