[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120116110631-lrzp6uxsjki7by22

diff --cc addons/web/common/http.py
Simple merge

diff --cc addons/web/controllers/main.py
index e8760ec,191f184..3a23556
--- 1/addons/web/controllers/main.py
--- 2/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@@ -18,9 -18,13 +18,13 @@@ from cStringIO import StringI
  
  import babel.messages.pofile
  import werkzeug.utils
+ try:
+     import xlwt
+ except ImportError:
+     xlwt = None
  
 -import web.common
 -openerpweb = web.common.http
 +from .. import common
 +openerpweb = common.http
  
  #----------------------------------------------------------
  # OpenERP Web web Controllers