[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Tue, 7 Dec 2010 04:18:23 +0000 (09:48 +0530)
committermtr <mtr@mtr>
Tue, 7 Dec 2010 04:18:23 +0000 (09:48 +0530)
bzr revid: mtr@mtr-20101207041823-4v40c0jcq73ndztv


Trivial merge