From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Fri, 27 Jan 2012 15:41:05 +0000 (+0100)
Subject: [MERGE] with rvalyi's work
X-Git-Tag: 6.1.0-web~351^2
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=84d57a468c5ff37ca478d76efb322547ccb50325;p=odoo%2Fodoo.git

[MERGE] with rvalyi's work

bzr revid: alexis@via.ecp.fr-20120127154105-93r6blsn2xsd17nu
---

84d57a468c5ff37ca478d76efb322547ccb50325