[MERGE] merged from lp:~openerp-commiter/openobject-addons/module1_addons
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 16 Mar 2010 12:52:37 +0000 (18:22 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 16 Mar 2010 12:52:37 +0000 (18:22 +0530)
commit0b7e7a6c8d693afd016175102ad96297e3e06653
tree5787e910f360e3c1682acca583d783e3eb4a9b42
parenta294aaf52b9011571a873b66dbf3f1cabdb6aa13
parent0987162dec5c8db3401deb7aeef54d56ff364dbd
[MERGE] merged from lp:~openerp-commiter/openobject-addons/module1_addons

bzr revid: hmo@tinyerp.com-20100316125237-w9ainjhc4susj899