[MERGE] auth_openid disabled by default

bzr revid: al@openerp.com-20110930185842-tqke1bdyhuogkcag

diff --cc addons/auth_openid/__openerp__.py
index 0000000,e974a8a..8cb178b
mode 000000,100644..100644
--- /dev/null
--- 2/addons/auth_openid/__openerp__.py
+++ b/addons/auth_openid/__openerp__.py
@@@ -1,0 -1,48 +1,48 @@@
+ # -*- coding: utf-8 -*-
+ ##############################################################################
+ #
+ #    OpenERP, Open Source Management Solution
+ #    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
+ #
+ #    This program is free software: you can redistribute it and/or modify
+ #    it under the terms of the GNU Affero General Public License as
+ #    published by the Free Software Foundation, either version 3 of the
+ #    License, or (at your option) any later version.
+ #
+ #    This program is distributed in the hope that it will be useful,
+ #    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #    GNU Affero General Public License for more details.
+ #
+ #    You should have received a copy of the GNU Affero General Public License
+ #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ ##############################################################################
+ 
+ 
+ {
+     'name': 'OpenID',
+     'version': '2.0',
+     'category': 'Authentification',
+     'description': """Allow users to login through OpenID.""",
+     'author': 'OpenERP s.a.',
+     'maintainer': 'OpenERP s.a.',
+     'website': 'http://www.openerp.com',
+     'depends': ['base'],
+     'data': [
+         'res_users.xml',
+     ],
+     'js': [
+         'static/src/js/auth_openid.js',
+     ],
+     'css': [
+         'static/src/css/openid.css',
+     ],
+     'external_dependencies': {
+         'python' : ['openid'],
+     },
+     'installable': True,
+     'active': False,
 -    'web_preload': True,
++    'web_preload': False,
+ }
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/web_livechat/__openerp__.py
index 642600a,cea342e..85187aa
--- 1/addons/web_livechat/__openerp__.py
--- 2/addons/web_livechat/__openerp__.py
+++ b/addons/web_livechat/__openerp__.py
@@@ -33,15 -33,9 +33,14 @@@ Add "Support" button in header from whe
      'website': 'http://openerp.com',
      'depends': ['base'],
      'update_xml': [],
 +    'js' : [
 +        'static/src/js/web_livechat.js',
 +    ],
 +    'css' : [
 +        'static/src/css/lc.css',
 +    ],
      'installable': True,
--    'active': True,
--    'web': True,
++    'active': False,
      'certificate': '0013762192410413',
 -    'images': ['images/web_livechat_support.jpeg'],
 +    'images': ['static/src/img/web_livechat_support.jpeg'],
  }

diff --cc addons/web_uservoice/__openerp__.py
index cc248e9,cc248e9..ebcc91e
--- 1/addons/web_uservoice/__openerp__.py
--- 2/addons/web_uservoice/__openerp__.py
+++ b/addons/web_uservoice/__openerp__.py
@@@ -35,7 -35,7 +35,6 @@@ Invite OpenERP user feedback, powered b
      'data': [],
      'installable': True,
      'active': False,
--    'web': True,
      'certificate': '0040452504963885',
      'images': ['images/submit_an_idea.jpeg','images/web_uservoice_feedback.jpeg'],
  }