merge from trunk

openerp-server

openerp/__init__.py

openerp/addons/base/__init__.py

openerp/addons/base/__openerp__.py

openerp/addons/base/base_data.xml

openerp/addons/base/i18n/ab.po

openerp/addons/base/i18n/af.po

openerp/addons/base/i18n/am.po

openerp/addons/base/i18n/ar.po

openerp/addons/base/i18n/base.pot

openerp/addons/base/i18n/bg.po

openerp/addons/base/i18n/bs.po

openerp/addons/base/i18n/ca.po

openerp/addons/base/i18n/cs.po

openerp/addons/base/i18n/da.po

openerp/addons/base/i18n/de.po

openerp/addons/base/i18n/el.po

openerp/addons/base/i18n/en_GB.po

openerp/addons/base/i18n/es.po

openerp/addons/base/i18n/es_AR.po