merge of '5dde2d982b4415230cf4fcc1095f4a732837813a'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 16:56:19 +0000 (16:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 16:56:19 +0000 (16:56 +0000)
     and 'e546707be8f44437449d19908d966d7a62798618'


Trivial merge