merge of '003d5589c32126d84385935351087e649339386a'
authorKoen Kooi <koen@openembedded.org>
Sat, 9 Aug 2008 07:03:35 +0000 (07:03 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 9 Aug 2008 07:03:35 +0000 (07:03 +0000)
     and 'faac6daf1f748c6f7109cbc33bb0af2fbe932c77'


Trivial merge