[MERGE]
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 23 May 2011 14:20:20 +0000 (16:20 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 23 May 2011 14:20:20 +0000 (16:20 +0200)
commit24822683dc7d0f712e5381c6cdc98a77132a39ec
treef18d7ff6b10fcde9eeda8ef1c3b31b1886ac367f
parent7499c98d421067b4e713a9bbba2ebff2c4631b26
parentda8281001a91c4ff858655be40b7eaf36e6eed5c
[MERGE]

bzr revid: qdp-launchpad@openerp.com-20110523142020-tlr7jjc1n3zhgf65