[MERGE] Upstream
authorStephane Wirtel <stw@openerp.com>
Thu, 22 Sep 2011 13:14:29 +0000 (15:14 +0200)
committerStephane Wirtel <stw@openerp.com>
Thu, 22 Sep 2011 13:14:29 +0000 (15:14 +0200)
bzr revid: stw@openerp.com-20110922131429-vlgqxnb37jsoaq5l

1  2 
addons/base_setup/base_setup_views.xml
addons/crm/crm_installer_view.xml

Simple merge