merge of '0dbdefdd9263a5773ede6a5c03b9b78084c095ef'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jul 2007 22:37:08 +0000 (22:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jul 2007 22:37:08 +0000 (22:37 +0000)
     and 'bd74e053a497c20615c3bf587005570d65e43cf6'


Trivial merge