[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authorksa (Open ERP) <ksa@tinyerp.co.in>
Fri, 11 Jun 2010 13:05:48 +0000 (18:35 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Fri, 11 Jun 2010 13:05:48 +0000 (18:35 +0530)
commitc149d1f809702c061bf19925c223f829dcb738c4
tree4e68c7dd81391e06cdf9e67e991be6ae604e4910
parenta4f7efe9df72be072aa0d77755ee01562efc1347
parent4985f9fe93849f7094d8ae8bd8e98deb419e8c83
[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: ksa@tinyerp.co.in-20100611130548-sr0i7od1jqa3bdnu