merge of '02d2a2fcfe802bc2a50b32abb39c188461f83cc8'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Sep 2008 10:20:07 +0000 (10:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Sep 2008 10:20:07 +0000 (10:20 +0000)
     and 'a83dd390e6cc7d972407dc06660f6b890764d341'


Trivial merge