merge of '53526775d6ee970cc212293fcfa79e27b87e4a5b'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:01:54 +0000 (10:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:01:54 +0000 (10:01 +0000)
     and 'ded2a6ac420467a4e7a2e1324eec6ccf1037ab27'


Trivial merge