From: Thibault Delavallée <tde@openerp.com>
Date: Tue, 17 Jul 2012 07:58:45 +0000 (+0200)
Subject: [MERGE] Merged with addons/trunk.
X-Git-Tag: 7.0-server~2853^2~46
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=6135e52cfcdce2054cf01e2ac4ff1b34c0d6b9f1;hp=-c;p=odoo%2Fodoo.git

[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120717075845-wpdcsvxywunqju5b
---

6135e52cfcdce2054cf01e2ac4ff1b34c0d6b9f1