[MERGE] trunk

openerp-server

openerp/addons/base/__openerp__.py

openerp/addons/base/base_data.xml

openerp/addons/base/base_update.xml

openerp/addons/base/i18n/cs.po

openerp/addons/base/i18n/en_GB.po

openerp/addons/base/i18n/kk.po

openerp/addons/base/ir/__init__.py

openerp/addons/base/ir/ir.xml

openerp/addons/base/ir/ir_actions.py

openerp/addons/base/ir/ir_attachment.py

openerp/addons/base/ir/ir_config_parameter.py

openerp/addons/base/ir/ir_mail_server.py

openerp/addons/base/ir/ir_model.py

openerp/addons/base/ir/ir_translation.py

openerp/addons/base/ir/ir_ui_view.py

openerp/addons/base/ir/ir_values.py

openerp/addons/base/ir/wizard/__init__.py

openerp/addons/base/ir/wizard/create_action.py

openerp/addons/base/ir/wizard/wizard_menu_view.xml