merge of 'c0b4eb64db45d24b111a58d9ffb1b180e4d17137'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 12:11:24 +0000 (12:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 12:11:24 +0000 (12:11 +0000)
     and 'd05a568510f934fffcdc39418db998497a694eae'


Trivial merge