merge of '035b260708b79727e8be13177849b2e99a73cf2f'
authorKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 12:08:51 +0000 (12:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 12:08:51 +0000 (12:08 +0000)
     and '5b87de517d4f4c222133820a354191f66043e5eb'


Trivial merge