From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 29 Jun 2012 12:56:01 +0000 (+0200)
Subject: [MERGE] latest trunk
X-Git-Tag: 7.0-server~2741^2~108
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=94539758525d56b3fbf35a93c87db511bf165327;p=odoo%2Fodoo.git

[MERGE] latest trunk

bzr revid: abo@openerp.com-20120629125601-jctwxucbo2jng73j
---

94539758525d56b3fbf35a93c87db511bf165327