merge of '2b438b3f55a45490f30d36bd6006d73826a40b2e'
authorKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 15:57:22 +0000 (15:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 15:57:22 +0000 (15:57 +0000)
     and '820c91664f0da9157d80383ae442fbebb356aab7'


Trivial merge