merge of '424953790319440fd6f6ed53f7e06225ac29f8df'
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Jul 2006 10:19:09 +0000 (10:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 27 Jul 2006 10:19:09 +0000 (10:19 +0000)
     and '9f101a66008e48dcb6c74d97567cb656101bd8a0'


Trivial merge