[MERGE] upstream

bzr revid: fme@openerp.com-20140325153725-67hb463km4yvsnoe

diff --cc openerp/http.py
index 0dc5e86,7e18238..ed8b558
--- 1/openerp/http.py
--- 2/openerp/http.py
+++ b/openerp/http.py
@@@ -1027,8 -1094,9 +1094,9 @@@ class Root(object)
          return self.dispatch(environ, start_response)
  
      def load_addons(self):
 -        """ Load all addons from addons patch containg static files and
 +        """ Load all addons from addons path containing static files and
          controllers and configure them.  """
+         # TODO should we move this to ir.http so that only configured modules are served ?
          statics = {}
  
          for addons_path in openerp.modules.module.ad_paths: