merge of '2813b5b33a80acca8e53166638a06c31c96fc819'
authorKoen Kooi <koen@openembedded.org>
Sat, 12 Aug 2006 09:05:48 +0000 (09:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 12 Aug 2006 09:05:48 +0000 (09:05 +0000)
     and '71d106209d375802f4d83fc7eba80d5515b6f572'


Trivial merge