From: Antony Lesuisse <al@openerp.com>
Date: Tue, 19 Jun 2012 13:42:23 +0000 (+0200)
Subject: [MERGE] trunk
X-Git-Tag: 7.0-server~2164^2~80
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=324885d640b8e1c84371b538d60e91886b5e7c6c;p=odoo%2Fodoo.git

[MERGE] trunk

bzr revid: al@openerp.com-20120619132452-ogzgxllhwdoxb1me
bzr revid: al@openerp.com-20120619134223-e08aib295f3wdbcs
---

324885d640b8e1c84371b538d60e91886b5e7c6c