merge of '1415f8fe0c4b15b7c24e2f8492c219ba906af8fd'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 14:44:21 +0000 (14:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 14:44:21 +0000 (14:44 +0000)
     and '871b52cc6f79e8ed85515aeaa65ff9cb0cd40bfa'


Trivial merge