[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Mon, 13 Dec 2010 12:35:13 +0000 (18:05 +0530)
committermtr <mtr@mtr>
Mon, 13 Dec 2010 12:35:13 +0000 (18:05 +0530)
bzr revid: mtr@mtr-20101213123513-nofzh38pz3r15vq5


Trivial merge