[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Tue, 14 Dec 2010 06:21:48 +0000 (11:51 +0530)
committermtr <mtr@mtr>
Tue, 14 Dec 2010 06:21:48 +0000 (11:51 +0530)
bzr revid: mtr@mtr-20101214062148-l81pwyxqkk1c20t8


Trivial merge