From: psi (Open ERP) <psi@tinyerp.co.in>
Date: Wed, 5 Jan 2011 12:41:39 +0000 (+0530)
Subject: [MERGE] merge with dev-addons3
X-Git-Tag: 6.0.0-server~37^2~4^2~28
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=40646c814cad66c627b4cb31134dd376d6424854;p=odoo%2Fodoo.git

[MERGE] merge with dev-addons3

bzr revid: psi@tinyerp.co.in-20110105124139-sf81okp4p30sunan
---

40646c814cad66c627b4cb31134dd376d6424854