[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Mon, 6 Dec 2010 07:24:49 +0000 (12:54 +0530)
committermtr <mtr@mtr>
Mon, 6 Dec 2010 07:24:49 +0000 (12:54 +0530)
commit73466af3532cab98d5ee6e14ff2b3f25eacd8e74
treeb325c32798904189f315ec985b6c6db325554ddf
parent4d2cc79c90332ad003640c9fcb3eaba269fa4bc6
parentd227e1455357f0b69714d10608d4a65fa62a3fac
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20101206072449-hq8204i2fgu7u9ml