From: Olivier Dony <odo@openerp.com>
Date: Mon, 5 Sep 2011 10:12:46 +0000 (+0200)
Subject: [MERGE] lastest trunk
X-Git-Tag: 6.1.0-rc1-addons~2064^2~6
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=70933cb532972b9fa6f35b59ab557edb2f695935;hp=70933cb532972b9fa6f35b59ab557edb2f695935;p=odoo%2Fodoo.git

[MERGE] lastest trunk

bzr revid: odo@openerp.com-20110905101246-k63hw8mvou4b0d2a
---