[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110909074820-o89mwdulwx8an13m

diff --cc openerp-server
index d2478d0,dbae1c3..7965a0c
--- 1/openerp-server
--- 2/openerp-server
+++ b/openerp-server
@@@ -259,21 -264,8 +264,20 @@@ if __name__ == "__main__"
      if config["stop_after_init"]:
          sys.exit(0)
  
 +    for m in openerp.conf.server_wide_modules:
 +        __import__(m)
 +        # Register a WSGI entry point if any.
 +        info = openerp.modules.module.load_information_from_description_file(m)
 +        if info['wsgi']:
 +            openerp.wsgi.register_wsgi_handler(getattr(sys.modules[m], info['wsgi']))
 +
 +    openerp.osv.osv.start_object_proxy()
 +    openerp.service.web_services.start_web_services()
 +    openerp.wsgi.serve()
 +
 +
      setup_pid_file()
      setup_signal_handlers()
-     start_services()
      logger = logging.getLogger('server')
      logger.info('OpenERP server is running, waiting for connections...')
      quit_on_signals()