[MERGE] trunk-v62_general_setting_config-jap (general config wizard)

bzr revid: rco@openerp.com-20120419130239-f7hkf8fhenvf4lwz

diff --cc addons/base_setup/__openerp__.py
index 093f2f4,360c7af..343ca8c
--- 1/addons/base_setup/__openerp__.py
--- 2/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@@ -36,7 -36,7 +36,7 @@@ Shows you a list of applications featur
      'website': 'http://www.openerp.com',
      'depends': ['base'],
      'init_xml': [],
-     'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml' ],
 -    'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml','res_config_view.xml' ],
++    'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'],
      'demo_xml': [],
      'installable': True,
      'auto_install': True,