merge of '69a79125da9281a2071776d84dc73c20ae8dbf97'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Sep 2007 10:25:53 +0000 (10:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Sep 2007 10:25:53 +0000 (10:25 +0000)
     and '9290de30e8c2f0306df4a03b4cd3c484bbd8ba6b'


Trivial merge