[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Tue, 7 Dec 2010 04:55:02 +0000 (10:25 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Tue, 7 Dec 2010 04:55:02 +0000 (10:25 +0530)
commitcf56ded4b24a3256fde646135be5ef9b727b562f
tree6f9a76d0bebdb6d0695e9568d9acea0f169d039b
parent5e3054ef8a4f4c060e9d121e65abc1fae835d203
parentf46c228003f0b65315e7e3bb64371345f2e988be
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: rpa@tinyerp.com-20101207045502-6ywih37d5tdc79tx