[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoraag (OpenERP) <aag@tinyerp.co.in>
Mon, 31 Jan 2011 04:57:44 +0000 (10:27 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Mon, 31 Jan 2011 04:57:44 +0000 (10:27 +0530)
commit4c0210b1938b1bf1b02713d73581871cfbbafad6
tree0520680979a8fbd02b866190d528d0be3809a5e7
parente1fb0f9f66656cb99076ee43065fddf457486b97
parent8a6d2875fba75ff167f79bdaddd55de343294657
[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: aag@tinyerp.co.in-20110131045744-o8ju43l1aufxlk3e