merge of '1065bf1f2e7b3927eac115451e22f3a6cdb43ec2'
authorKoen Kooi <koen@openembedded.org>
Wed, 17 Oct 2007 17:25:20 +0000 (17:25 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 17 Oct 2007 17:25:20 +0000 (17:25 +0000)
     and 'ce6e70caf14f47e77ee67c3e73490db4ade16767'


Trivial merge