From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 11 Nov 2011 13:54:14 +0000 (+0100)
Subject: merge
X-Git-Tag: 6.1.0-rc1-addons~1382
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b55a9cbcfe64f3f641a9c6e3442232ff4951d64f;p=odoo%2Fodoo.git

merge

bzr revid: fp@tinyerp.com-20111111135414-2qk32ep1pbbco41v
---

b55a9cbcfe64f3f641a9c6e3442232ff4951d64f