[MERGE] trunk

bzr revid: al@openerp.com-20121209182643-9fv5ge2b2r2hrpbv

diff --cc openerp/service/__init__.py
index 6c8e0f4,1c8f27b..736f7d4
--- 1/openerp/service/__init__.py
--- 2/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@@ -83,9 -84,11 +84,8 @@@ def start_services()
      netrpc_server.init_servers()
  
      # Start the main cron thread.
-     if openerp.conf.max_cron_threads:
-         openerp.cron.start_master_thread()
+     cron.start_master_thread()
  
 -    # Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC).
 -    openerp.netsvc.Server.startAll()
 -
      # Start the WSGI server.
      openerp.service.wsgi_server.start_server()