merge of '00032e7126f86cd85fcd04db2fbf6b89c2502be7'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 10:50:59 +0000 (10:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 10:50:59 +0000 (10:50 +0000)
     and 'a0b62356b744396a4e9fc284292fa4df77a1a99e'


Trivial merge