[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Thu, 13 Jan 2011 11:52:57 +0000 (17:22 +0530)
committermtr <mtr@mtr>
Thu, 13 Jan 2011 11:52:57 +0000 (17:22 +0530)
bzr revid: mtr@mtr-20110113115257-qbh0q93dfelwz836


Trivial merge