[Merge]: Merge with trunk-import_sugarcrm branch
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Tue, 31 May 2011 05:18:52 +0000 (10:48 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Tue, 31 May 2011 05:18:52 +0000 (10:48 +0530)
commitcd56eed7f74e741d7d720eb3b7114fd5b96a5208
treef26fe4a983735cb95f88b342c3790e0a39a92b7c
parentdb97c26b61f09d5d065b419a38b4a744942bd8a5
parent8e8bb68f2c4ab36d714f3d803601edae0665b764
[Merge]: Merge with trunk-import_sugarcrm branch

bzr revid: atp@tinyerp.com-20110531051852-mh4np5fneec36wc7