merge of '7f7e2abbafbc78c693195ccd3ecbc44742312157'
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Aug 2007 03:06:24 +0000 (03:06 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 28 Aug 2007 03:06:24 +0000 (03:06 +0000)
     and 'a3a33729f3f0c0ad0c71c9872010fc1d7dd4f9ee'


Trivial merge