[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Fri, 17 Dec 2010 11:06:53 +0000 (16:36 +0530)
committermtr <mtr@mtr>
Fri, 17 Dec 2010 11:06:53 +0000 (16:36 +0530)
bzr revid: mtr@mtr-20101217110653-nq4jsa2e1sie5bxb


Trivial merge