merge of '168c993c49f268b8a0f366d8ffd63a961512f7fe'
authorKoen Kooi <koen@openembedded.org>
Sat, 22 Sep 2007 07:26:49 +0000 (07:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 22 Sep 2007 07:26:49 +0000 (07:26 +0000)
     and 'ed2f6968f3a6025abbe5062431c947ea2d34b5aa'


Trivial merge