merge of 'ba1952e77d8317a620918dafd4d7de027e092e7d'
authorKoen Kooi <koen@openembedded.org>
Thu, 24 Aug 2006 12:02:10 +0000 (12:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 24 Aug 2006 12:02:10 +0000 (12:02 +0000)
     and 'e8b7b3d17794e7d13096074a170b245f63ac7e95'


Trivial merge