[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoraag (OpenERP) <aag@tinyerp.co.in>
Thu, 23 Dec 2010 05:20:44 +0000 (10:50 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Thu, 23 Dec 2010 05:20:44 +0000 (10:50 +0530)
commit4b13fb1d963d8bef07a3b91db04eefff7defb50c
tree17eb3b4313969cacebc190d58e701adf1b117c38
parent7f6aeb6241329d8e46faffe9ef29d66b5416da0f
parentd49df35eb43d0b18b2a9ddd562b75642a840b1aa
[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: aag@tinyerp.co.in-20101223052044-98gzte8l9nm15n0n