merge of '4dfc78edd77f8873f466310c5aeb329cb95eb08e'
authorKoen Kooi <koen@openembedded.org>
Sun, 6 Aug 2006 13:00:11 +0000 (13:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 6 Aug 2006 13:00:11 +0000 (13:00 +0000)
     and '59db0e08dee38b700ad535721bd778414bd8b07c'


Trivial merge