[MERGE] opw 5852
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 3 Aug 2011 08:02:46 +0000 (10:02 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 3 Aug 2011 08:02:46 +0000 (10:02 +0200)
commitac447780240fdb5c00cbb86dbdc8bbfa4a60207d
tree31e380d80e2b33791f50ba8575b14a2f2a464540
parent2aa77f54408584f5652efaf6262b57217c236604
parent1e2fc10bbf43e39e9acab15afa7e4794b3528c69
[MERGE] opw 5852

bzr revid: qdp-launchpad@openerp.com-20110803080246-0f4bqo94cvh11l90