merge of '3e30d03effd5d61bd64c55ec0e69214ced9039ca'
authorKoen Kooi <koen@openembedded.org>
Wed, 8 Aug 2007 14:29:01 +0000 (14:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 8 Aug 2007 14:29:01 +0000 (14:29 +0000)
     and 'bf37569e4e207171af4ea9b1e9879b303cedf759'


Trivial merge