merge of '148cdd86dd3fa957bcac82224ad1babe724fd835'
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 12:34:04 +0000 (12:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 12:34:04 +0000 (12:34 +0000)
     and 'e7a356a3b4d3b6c4b75e2e62660084b08603ab51'


Trivial merge