[MERGE]: Merge with latest trunk-server

[odoo/odoo.git] / openerp / __init__.py

diff --git a/openerp/__init__.py b/openerp/__init__.py
index 63016a5..7e723c4 100644 (file)
--- a/openerp/__init__.py
+++ b/openerp/__init__.py
@@ -22,17 +22,17 @@
 """ OpenERP core library.
 
 """
+# The hard-coded super-user id (a.k.a. administrator, or root user).
+SUPERUSER_ID = 1
 
 import addons
 import conf
-import ir
 import loglevels
 import modules
 import netsvc
 import osv
 import pooler
 import pychart
-import registry
 import release
 import report
 import run_tests
@@ -43,6 +43,7 @@ import tiny_socket
 import tools
 import wizard
 import workflow
+import wsgi
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: