merge of '381f062d9435d56c4a2fe6ab295046be014e94a1'
authorKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:02:32 +0000 (10:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:02:32 +0000 (10:02 +0000)
     and '636893a3af4e8e5404ce4917f3701dbe8fc0ab46'


Trivial merge