merge of '1381c99b5b235453ffd6d1e9c2eaeae4f080910b'
authorKoen Kooi <koen@openembedded.org>
Sat, 16 Aug 2008 13:16:22 +0000 (13:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 16 Aug 2008 13:16:22 +0000 (13:16 +0000)
     and 'dbeff9227117d6552a46cabd79dc42643b6feebe'


Trivial merge