merge of '2ae98c73d0708cb2d224fbf130a90805e19503ee'
authorKoen Kooi <koen@openembedded.org>
Thu, 25 Sep 2008 12:37:36 +0000 (12:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 25 Sep 2008 12:37:36 +0000 (12:37 +0000)
commitead4e5a8182144ef31d860371ab56be82860536c
tree1f7a36f14435dfea40184661f1be50f96e06ec3e
parent8e4e856e3ce058841adf6692c83efca0c2fc85c2
parent18b8a107ca4f903a486988b9562c8055ada1c018
Merge ... '2ae98c73d0708cb2d224fbf130a90805e19503ee'
     and '9b5a0eebc140a11b64876ab88fc1ca50059ff6fa'