merge of '4e7386151d1273724db821c550dbd7106a83f5ab'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Sep 2006 17:21:52 +0000 (17:21 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Sep 2006 17:21:52 +0000 (17:21 +0000)
     and 'cf8c1ed406de001e5360194fb99e473ec381a3a0'


Trivial merge