merge of '5aa5d42f826b82e5dcae45d30186d8ec6fc7f784'
authorKoen Kooi <koen@openembedded.org>
Tue, 29 Aug 2006 09:07:57 +0000 (09:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 29 Aug 2006 09:07:57 +0000 (09:07 +0000)
     and 'c0aaf39c5aa5cccb43a4e2e31affbf6f06a62c4a'


Trivial merge