[MERGE] from trunk

bzr revid: xmo@openerp.com-20121010154436-wz29sdkbs9vvhjba

diff --cc openerp/addons/base/ir/ir_actions.py
index b14f4cd,d3b0045..8ec1bea
--- 1/openerp/addons/base/ir/ir_actions.py
--- 2/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@@ -328,9 -329,8 +328,9 @@@ class act_wizard(osv.osv)
  act_wizard()
  
  class act_url(osv.osv):
-     _name = 'ir.actions.url'
+     _name = 'ir.actions.act_url'
      _table = 'ir_act_url'
 +    _inherit = 'ir.actions.actions'
      _sequence = 'ir_actions_id_seq'
      _order = 'name'
      _columns = {

diff --cc openerp/osv/fields.py
Simple merge

diff --cc openerp/osv/orm.py
Simple merge

diff --cc openerp/tests/addons/test_impex/tests/test_import.py
Simple merge

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

diff --cc setup.py
Simple merge