merge of '4d5affce3ba65df3658b9b749b1db11d11ef1d8f'
authorKoen Kooi <koen@openembedded.org>
Sun, 29 Oct 2006 11:32:36 +0000 (11:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 29 Oct 2006 11:32:36 +0000 (11:32 +0000)
     and '684595150a0e865a406770102f72a2e93285b9a3'


Trivial merge