[MERGE]with main branch

bzr revid: jpr@tinyerp.com-20140415053250-r784vpfu9x8gnfll
bzr revid: jpr@tinyerp.com-20140424045737-h6pshjslqw8xqyvm

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

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

diff --cc openerp/addons/base/module/module.py
Simple merge