merge of '8ed5d1634e5cf85d56285543499643908effdede'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Dec 2006 11:10:15 +0000 (11:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Dec 2006 11:10:15 +0000 (11:10 +0000)
     and 'a98e06eb29c0d8f228038acbaf2a660ea5c43fc6'


Trivial merge