[MERGE] Upstream

bzr revid: stw@openerp.com-20111214124257-06ovpmn9n9d96ci4

diff --cc addons/base_contact/__openerp__.py
index 716db29,27d06dc..77dabe2
--- 1/addons/base_contact/__openerp__.py
--- 2/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@@ -45,9 -45,9 +45,8 @@@ Pay attention that this module convert
      'depends': ['base','process'],
      'init_xml': [],
      'update_xml': [
-         'security/base_contact_security.xml',
          'security/ir.model.access.csv',
          'base_contact_view.xml',
 -        'base_contact_installer_view.xml',
          'process/base_contact_process.xml'
      ],
      'demo_xml': ['base_contact_demo.xml'],

diff --cc addons/base_contact/base_contact_demo.xml
Simple merge

diff --cc addons/base_contact/test/base_contact00.yml
Simple merge

diff --cc addons/event/__openerp__.py
index 67d45c3,599edd0..131f6d4
--- 1/addons/event/__openerp__.py
--- 2/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@@ -39,10 -39,9 +39,9 @@@ Note that
          Association / Configuration / Types of Events
  """,
      'author': 'OpenERP SA',
 -    'depends': ['crm', 'base_contact', 'account', 'marketing', 'mail'],
 +    'depends': ['crm', 'account', 'marketing', 'mail'],
      'init_xml': [],
      'update_xml': [
-         'security/event_security.xml',
          'security/ir.model.access.csv',
          'wizard/event_confirm_registration_view.xml',
          'wizard/event_confirm_view.xml',