merge of '189467654b7dd4ef08fe922c71ecdfe054b0e4dc'
authorKoen Kooi <koen@openembedded.org>
Wed, 7 Mar 2007 17:12:32 +0000 (17:12 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 7 Mar 2007 17:12:32 +0000 (17:12 +0000)
     and 'b71a708b2295b209f7756cd3fbcd4848fb5db788'


Trivial merge