merge of '34f6928a9e37b4cbcbf32f2d5a04ecf42a67b8dc'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 14:14:13 +0000 (14:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 14:14:13 +0000 (14:14 +0000)
     and '4f46377bcdabbb736ecf3eabda1271d12fccfcd1'


Trivial merge