merge of '910e407ede2c21fb664e4341b86db29ea58c5a5e'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 18:15:24 +0000 (18:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 18:15:24 +0000 (18:15 +0000)
     and 'd6f3bb8607dabe43539791a91bd897b0f9089cf2'


Trivial merge