[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authoratp (Open ERP) <atp@tinyerp.co.in>
Mon, 10 May 2010 05:03:13 +0000 (10:33 +0530)
committeratp (Open ERP) <atp@tinyerp.co.in>
Mon, 10 May 2010 05:03:13 +0000 (10:33 +0530)
bzr revid: atp@tinyerp.co.in-20100510050313-pvbr188nbn7wfahh


Trivial merge