From: ksa (Open ERP) Date: Tue, 16 Nov 2010 05:45:15 +0000 (+0530) Subject: [MERGE]: Merge with lp:openobject-trunk-dev-addons2 X-Git-Tag: 6.0.0-rc2-addons~12^2~36^2~43 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=496205710ee6373772a0dee3d486d8622fa23a0b;p=odoo%2Fodoo.git [MERGE]: Merge with lp:openobject-trunk-dev-addons2 bzr revid: ksa@tinyerp.co.in-20101116054515-jlbovcgl4eopg2uw --- 496205710ee6373772a0dee3d486d8622fa23a0b