merge of '5a2fb2965a905224af0a1e26d73f342ecf8944e8'
authorKoen Kooi <koen@openembedded.org>
Thu, 7 Aug 2008 11:14:47 +0000 (11:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 7 Aug 2008 11:14:47 +0000 (11:14 +0000)
     and '6fc6bb1fff3ea7b5546ddedf048c33f9a287ac15'


Trivial merge