[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Mon, 12 Jul 2010 06:53:30 +0000 (12:23 +0530)
committermtr <mtr@mtr>
Mon, 12 Jul 2010 06:53:30 +0000 (12:23 +0530)
bzr revid: mtr@mtr-20100712065330-bx3f9r7gi4wr0p9v


Trivial merge