From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 7 Jan 2009 14:09:00 +0000 (+0100)
Subject: merge
X-Git-Tag: 5.0.0-addons~265
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=20f5b98f8840485cb56990ed8def154965e3e6c4;p=odoo%2Fodoo.git

merge

bzr revid: fp@tinyerp.com-20090107140900-qv63cftjstdkdeoz
---

20f5b98f8840485cb56990ed8def154965e3e6c4