merge of '447bcfa88f0dd373b4eabc33996f6b72e757747a'
authorKoen Kooi <koen@openembedded.org>
Tue, 22 Aug 2006 09:32:55 +0000 (09:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 22 Aug 2006 09:32:55 +0000 (09:32 +0000)
     and 'df80e8275fc1660e621907c57ed67954a90e7cb9'


Trivial merge