merge of '0d5d329305f1889da24316c8f1a1c4055aa1c965'
authorKoen Kooi <koen@openembedded.org>
Fri, 11 Aug 2006 18:38:10 +0000 (18:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 11 Aug 2006 18:38:10 +0000 (18:38 +0000)
     and 'a064ac2b5db052cbadae6856a18d5be4dd8ef6e9'


Trivial merge