merge of '873da0372ff3245a206abda6731109ceff7fda5a'
authorKoen Kooi <koen@openembedded.org>
Sat, 13 Oct 2007 17:59:57 +0000 (17:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 13 Oct 2007 17:59:57 +0000 (17:59 +0000)
commitde2cbf130ba5be2e7b8655c63e7f2a3acf995f05
tree0bd3d199352e55d226c40222e12d869d12f005cd
parent8fde3dd1477ce3daadc2b4376ea82be86ebb62ad
parent3edc7404867e99f3683bf9f5d8d33cc7ea6c983a
Merge ... '873da0372ff3245a206abda6731109ceff7fda5a'
     and 'b7fa0aff3156da49cf51f8356ad60d91a84ac274'