merge of '7c69d6f82807a2236b393c167a2f687e6d31f479'
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 10:14:48 +0000 (10:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 10:14:48 +0000 (10:14 +0000)
     and 'e89c096197c1edb468e2fa9e49482a06b639bf1e'


Trivial merge