merge of '189bf0db22327cd99864022fed3f4e85c98cde72'
authorKoen Kooi <koen@openembedded.org>
Mon, 7 May 2007 17:56:50 +0000 (17:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 7 May 2007 17:56:50 +0000 (17:56 +0000)
     and 'adb2b82ee900910b01239587279ad8cbd3f6b150'


Trivial merge