merge of 'ccc0894b166e387c9e2ae80e0f6e03fee22306d5'
authorKoen Kooi <koen@openembedded.org>
Mon, 11 Sep 2006 08:27:59 +0000 (08:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 11 Sep 2006 08:27:59 +0000 (08:27 +0000)
     and 'd2e1959c4d2d8f9a070ee5db2eedd636d8dc687d'


Trivial merge