From: Quentin (OpenERP) <qdp-launchpad@openerp.com>
Date: Wed, 20 Apr 2011 15:31:59 +0000 (+0200)
Subject: [MERGE] lp: 753651
X-Git-Tag: 6.1.0-rc1-addons~1481^2~18
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b8f2c5223ec6debd58355b02c3df1877a50a2c0b;p=odoo%2Fodoo.git

[MERGE] lp: 753651

bzr revid: qdp-launchpad@openerp.com-20110420153159-3eyke1hf34yx3w96
---

b8f2c5223ec6debd58355b02c3df1877a50a2c0b