merge of '2d9bb3f1e645b23643eaf7cf8ccc4f31c1b84f21'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 08:28:58 +0000 (08:28 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 08:28:58 +0000 (08:28 +0000)
     and '873dfa47c10fc80c1aefe1dd805391a01b9124b9'


Trivial merge