merge of 'cf1a08098edb7df94073a8189329602a04381206'
authorKoen Kooi <koen@openembedded.org>
Fri, 28 Jul 2006 07:49:46 +0000 (07:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 28 Jul 2006 07:49:46 +0000 (07:49 +0000)
     and 'f43951bf0f4ebd5ecbec9b661205593b8837d3eb'


Trivial merge