merge of '2a763ba11cf69b342a356812987f63bb2053011b'
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Dec 2007 12:15:18 +0000 (12:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 3 Dec 2007 12:15:18 +0000 (12:15 +0000)
     and '4ca56810304293da744170c82e50552f5dcf084f'


Trivial merge