merge

bzr revid: chs@openerp.com-20120911120807-8wvvh0tubdoqkwa0

diff --cc openerp-server
Simple merge

diff --cc openerp/addons/base/module/module.py
index 77f305b,ae1268a..fc13d3a
--- 1/openerp/addons/base/module/module.py
--- 2/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@@ -26,8 -26,10 +26,9 @@@ import loggin
  import os
  import re
  import shutil
 -import sys
  import tempfile
  import urllib
+ import urllib2
  import zipfile
  import zipimport
  
@@@ -36,9 -38,6 +37,7 @@@ try
  except ImportError:
      from StringIO import StringIO   # NOQA
  
- import requests
- 
 +import openerp
  from openerp import modules, pooler, release, tools, addons
  from openerp.tools.parse_version import parse_version
  from openerp.tools.translate import _