manual merge of multicorn

openerp-server

openerp-wsgi.py

openerp/__init__.py

openerp/addons/base/ir/ir_cron.py

openerp/db/__init__.py

openerp/service/__init__.py

openerp/service/netrpc_server.py

openerp/service/netrpc_socket.py

openerp/service/workers.py

openerp/service/wsgi_server.py

openerp/tools/config.py

openerp/wsgi/__init__.py

openerp/wsgi/proxied.py