[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Fri, 11 Jun 2010 05:23:32 +0000 (10:53 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Fri, 11 Jun 2010 05:23:32 +0000 (10:53 +0530)
bzr revid: rpa@tinyerp.com-20100611052332-j2fzomxzq6yg9gi3

1  2 
addons/crm/crm_lead_view.xml

Simple merge