merge of '23094adbbe1c0cf4e6533536f3d839d77e1e5bbf'
authorKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 18:03:44 +0000 (18:03 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 18:03:44 +0000 (18:03 +0000)
     and 'e52349bdf770c1441b7661f55056b3cf08ffe21e'


Trivial merge