[MERGE] active becomes auto_install: install this module when its dependencies (that...

bzr revid: al@openerp.com-20120130211812-w0wu42hdu4l7koc4

diff --cc addons/account_bank_statement_extensions/__openerp__.py
Simple merge

diff --cc addons/plugin_thunderbird/__openerp__.py
index 050855d,5d4c524..c135491
--- 1/addons/plugin_thunderbird/__openerp__.py
--- 2/addons/plugin_thunderbird/__openerp__.py
+++ b/addons/plugin_thunderbird/__openerp__.py
@@@ -38,8 -38,9 +38,8 @@@ HR Applicant and Project Issue from sel
        """,
      "init_xml" : [],
      "demo_xml" : [],
 -    "update_xml" : ['thunderbird_installer.xml',
 -                    'security/ir.model.access.csv'],
 +    "update_xml" : ['plugin_thunderbird.xml'],
-     "active": False,
+     "auto_install": False,
      "installable": True,
      "certificate" : "00899858104035139949",
      'images': ['images/config_thunderbird.jpeg','images/config_thunderbird_plugin.jpeg','images/thunderbird_document.jpeg'],