merge of '2fce1b18b908ec5929c213cc29050175502a72a6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 9 Jun 2008 22:48:49 +0000 (22:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 9 Jun 2008 22:48:49 +0000 (22:48 +0000)
     and 'a42c91c4ca9edb328881ae31da2dbdb01a976e1e'


Trivial merge