merge of '9767e2c8632f709640f3b42264030553c9906cb2'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 14:39:19 +0000 (14:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 14:39:19 +0000 (14:39 +0000)
     and 'c21c001cf452d0c8ffbe2041880be4d68d0fdec9'


Trivial merge