From: HDA (OpenERP) <hda@tinyerp.com>
Date: Mon, 29 Mar 2010 06:11:18 +0000 (+0530)
Subject: merged
X-Git-Tag: 6.0.0-rc1-server~116^2~112
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=8a10ac164a2fb9e6dce7406e058c345d2c15f819;p=odoo%2Fodoo.git

merged

bzr revid: hda@tinyerp.com-20100329061118-7bgomiohtjgwnhza
---

8a10ac164a2fb9e6dce7406e058c345d2c15f819