From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 4 Sep 2008 16:20:11 +0000 (+0200)
Subject: merge
X-Git-Tag: 5.0.0-alpha-addons~433
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=977f609d4c4cdf9aa0373399ab5125158915c615;p=odoo%2Fodoo.git

merge

bzr revid: fp@tinyerp.com-20080904162011-nack4jhdga7l0soc
---

977f609d4c4cdf9aa0373399ab5125158915c615