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)
commitef21addc927288c9613feb6d988bc667b0a017c7
tree4b53fe5ee5146fa9d49c64afebb7a8b83be4d04b
parent1ddd28e44a093f410201d8c6bbe91a85aaa4470a
parente2a4d85b3891006d979774eee012a44c14e1e55e
Merge ... '447bcfa88f0dd373b4eabc33996f6b72e757747a'
     and 'df80e8275fc1660e621907c57ed67954a90e7cb9'