[MERGE] trunk

bzr revid: al@openerp.com-20140227161819-p9chmskfifo0rygs

diff --cc openerp/addons/base/ir/ir_attachment.py
Simple merge

diff --cc openerp/cli/server.py
Simple merge

diff --cc openerp/http.py
Simple merge

diff --cc openerp/modules/module.py
index 9851123,a443a25..554b38f
--- 1/openerp/modules/module.py
--- 2/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@@ -45,6 -40,10 +40,7 @@@ from openerp.tools.safe_eval import saf
  _logger = logging.getLogger(__name__)
  _test_logger = logging.getLogger('openerp.tests')
  
 -# addons path ','.joined
 -_ad = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'addons') # default addons path (base)
 -
+ # addons path as a list
  ad_paths = []
  
  # Modules already loaded

diff --cc openerp/service/db.py
Simple merge

diff --cc openerp/service/server.py
Simple merge

diff --cc openerp/tools/config.py
Simple merge

diff --cc openerp/tools/translate.py
Simple merge