merge of '32cacec64cdbd8fb3ef60cf340711ad9e3b80d98'
authorKoen Kooi <koen@openembedded.org>
Sat, 27 Sep 2008 08:10:25 +0000 (08:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 27 Sep 2008 08:10:25 +0000 (08:10 +0000)
     and 'c8a9321165acfe4dabcb4b602008270c7d2ea7c7'


Trivial merge