merge of '2c0fad768939f606b65e1c9b4e1220f0209883f7'
authorKoen Kooi <koen@openembedded.org>
Wed, 8 Aug 2007 06:20:51 +0000 (06:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 8 Aug 2007 06:20:51 +0000 (06:20 +0000)
     and 'c441a97d0a545c68ad7de39b4729d857ef08723c'


Trivial merge