merge of '0cb2088c75cd013fa4b79bb46028d9d384f0ef81'
authorKoen Kooi <koen@openembedded.org>
Sun, 3 Sep 2006 07:24:56 +0000 (07:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 3 Sep 2006 07:24:56 +0000 (07:24 +0000)
     and 'ff7b9f5ef2329b56356a8adcbf70e4c4e9a3ecdb'


Trivial merge