[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Mon, 21 Jun 2010 14:06:08 +0000 (19:36 +0530)
committermtr <mtr@mtr>
Mon, 21 Jun 2010 14:06:08 +0000 (19:36 +0530)
bzr revid: mtr@mtr-20100621140608-922odd1dew2vljwd


Trivial merge