[MEREG] Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authorsbh (Open ERP) <sbh@tinyerp.com>
Tue, 1 Jun 2010 06:25:35 +0000 (11:55 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Tue, 1 Jun 2010 06:25:35 +0000 (11:55 +0530)
commit6dd09914ffd0b906e4ea2cb305ad1eeeb9e65b49
tree32477f82e642f82519fc0cf4f0546e0625f0a51f
parent2f22f72c6a3e139313d89c857dbfd4494b993c90
parentb746d3531ef9ab1d9b0a940a0f083fefcd7a4e89
[MEREG] Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: sbh@tinyerp.com-20100601062535-1lgp1ka1gg0t29tv