merge of '189467654b7dd4ef08fe922c71ecdfe054b0e4dc'
authorKoen Kooi <koen@openembedded.org>
Wed, 7 Mar 2007 17:12:32 +0000 (17:12 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 7 Mar 2007 17:12:32 +0000 (17:12 +0000)
commit498d84d6e0bcf9c597e0c4e95a62c43e60a54ffa
tree3d9a10c3c4e1404c00a1e241d187d7457f27bbd1
parent2e3d52b4519c2c3c446da13536647ef6146799ed
parent3a72565ebf8f5cc366a8b04e23adcf402b05541d
Merge ... '189467654b7dd4ef08fe922c71ecdfe054b0e4dc'
     and 'b71a708b2295b209f7756cd3fbcd4848fb5db788'