merge of '80ab682c6bb8a0598f7082eb2cfc84039cc516ba'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jul 2007 17:49:53 +0000 (17:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jul 2007 17:49:53 +0000 (17:49 +0000)
     and '9e9051124800e7d4f113baa880bf489834c0fbf2'


Trivial merge