merge of '873da0372ff3245a206abda6731109ceff7fda5a'
authorKoen Kooi <koen@openembedded.org>
Sat, 13 Oct 2007 17:59:57 +0000 (17:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 13 Oct 2007 17:59:57 +0000 (17:59 +0000)
     and 'b7fa0aff3156da49cf51f8356ad60d91a84ac274'


Trivial merge