From: Thibault Delavallée <tde@openerp.com>
Date: Tue, 21 May 2013 12:36:24 +0000 (+0200)
Subject: [MERGE] Sync with trunk
X-Git-Tag: InsPy_master01~1277^2~3
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b1e0f9f6f2c845de9837b6936d1cea0cb9554ce1;p=odoo%2Fodoo.git

[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130521123624-u6cqs144rbuzrmpo
---

b1e0f9f6f2c845de9837b6936d1cea0cb9554ce1