merge of '7ca686a64736f6787bbb283a3f9d21966212d549'
authorKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 20:44:42 +0000 (20:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 20:44:42 +0000 (20:44 +0000)
     and 'b3c3672e33744be20e96f868564159e2b02bb718'


Trivial merge