[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authoratp (Open ERP) <atp@tinyerp.co.in>
Tue, 11 May 2010 05:37:54 +0000 (11:07 +0530)
committeratp (Open ERP) <atp@tinyerp.co.in>
Tue, 11 May 2010 05:37:54 +0000 (11:07 +0530)
commitda79eb0874cd3f2826df18c9234c431e62ff680a
tree287c210773e6cd8eb3dff99a96e6e26d9457ecef
parentac3736381ced8e350c2aafcd426eec2ff1f16eb8
parentff5c9032fc6645d3c30cd5cbfd91a0a0e8393db0
[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: atp@tinyerp.co.in-20100511053754-wf0po9nh476a9uw0