merge of '7c69d6f82807a2236b393c167a2f687e6d31f479'
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 10:14:48 +0000 (10:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 10:14:48 +0000 (10:14 +0000)
commit236047df425af9f1b51bd9362b840b1f5c388e89
tree937b595a093f890425df6b3922a80d894893a4a0
parentcab1459201a7000bc51c4e9b26b095b15383fe7c
parenta212724b9bb47a6906f520793d01327ef2be6f2f
Merge ... '7c69d6f82807a2236b393c167a2f687e6d31f479'
     and 'e89c096197c1edb468e2fa9e49482a06b639bf1e'