merge of 1f12dbd1bf0fd30504f661a5c169a9551e06202b
authorKoen Kooi <koen@openembedded.org>
Fri, 12 May 2006 07:11:30 +0000 (07:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 May 2006 07:11:30 +0000 (07:11 +0000)
     and 4ee0eea0ff207e681c6c5b09e879932e2a91b42b


Trivial merge