merge of '07b7a00cd47af0555ac72032429c0ef42baad5ec'
authorKoen Kooi <koen@openembedded.org>
Wed, 22 Aug 2007 11:17:17 +0000 (11:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 22 Aug 2007 11:17:17 +0000 (11:17 +0000)
     and 'a9b77dce74783f5b5be87dcb91229c55762834fc'


Trivial merge