merge of 'b4ff8a1878072f19f8f3a513f100426adcf08ca1'
authorKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 18:26:51 +0000 (18:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 18:26:51 +0000 (18:26 +0000)
     and 'b7a206bd07ea866943577e511b80367c23762c5d'


Trivial merge