[MERGE]: Merge with lp:openobject-addons/trunk
authorRucha (Open ERP) <rpa@tinyerp.com>
Thu, 17 Feb 2011 07:16:27 +0000 (12:46 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Thu, 17 Feb 2011 07:16:27 +0000 (12:46 +0530)
commit9f87644d13cd85bb39e78f028e69a843d82125ea
treeda73ae7db3bc7fb91276ffe47d444b25a1e50d75
parent828ad75636b88806137509309f8fbef050f53bd0
parent5eb533a415f8e9738a81554cb4237597f1977485
[MERGE]: Merge with lp:openobject-addons/trunk

bzr revid: rpa@tinyerp.com-20110217071627-8poiv4w8e3fivwvi