merge of '45d524b88abbb00dc07aaebd7b8f052ad47664b6'
authorKoen Kooi <koen@openembedded.org>
Thu, 24 Aug 2006 18:23:19 +0000 (18:23 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 24 Aug 2006 18:23:19 +0000 (18:23 +0000)
     and '593627942ba1a6623af7a814fb51159b1de235c1'


Trivial merge