From: Thibault Delavallée <tde@openerp.com>
Date: Mon, 2 Jul 2012 15:55:05 +0000 (+0200)
Subject: [MERGE] Merged with addons/trunk.
X-Git-Tag: 7.0-server~893^2~49^2~5
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b7f2854c5999cd68ea3f6a8146b6254ffad5e0e7;p=odoo%2Fodoo.git

[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120702155505-xnyy7oy97obmwcu2
---

b7f2854c5999cd68ea3f6a8146b6254ffad5e0e7