[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Fri, 29 Oct 2010 12:41:32 +0000 (18:11 +0530)
committermtr <mtr@mtr>
Fri, 29 Oct 2010 12:41:32 +0000 (18:11 +0530)
commit90a28051b7b0759e9a1c5d0e54aae2ebed211541
treef1ea4ce46ca01892a295145ad3f8e1d728b3c8d4
parentf196feaa3b032a83e78c5e79a4883ffd3cea48fa
parent01c028d9f81ab03c7cb914027091eb49b9883fd5
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20101029124132-wiut9v38py0zpte8