[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Fri, 11 Jun 2010 12:47:17 +0000 (18:17 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Fri, 11 Jun 2010 12:47:17 +0000 (18:17 +0530)
commitbb253a8e2af91ede54f56c1eed0050a54e337c75
tree63cbf2e6809f0e97ea90ca204df7f64a73d0a121
parent258f1a7729ba96b94a0ee1ce50ff34afb1c8cfcb
parent4985f9fe93849f7094d8ae8bd8e98deb419e8c83
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: rpa@tinyerp.com-20100611124717-ggoc6c04pwzmf1xi