From: Frédéric van der Essen <fva@openerp.com>
Date: Tue, 25 Sep 2012 14:11:40 +0000 (+0200)
Subject: [MERGE] from trunk
X-Git-Tag: 7.0-server~23^2~209^2~4
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=ce3485c51c087fe134fe05c8f3e3ccc98e34b37c;p=odoo%2Fodoo.git

[MERGE] from trunk

bzr revid: fva@openerp.com-20120924150127-uky1tz5g8ecnvqs2
bzr revid: fva@openerp.com-20120925141140-oe20lwnxjzmdqctx
---

ce3485c51c087fe134fe05c8f3e3ccc98e34b37c