[MERGE] trunk

bzr revid: al@openerp.com-20111215120749-zran9bu9yibr2zru

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/js/views.js
index 0ad49f6,94972fc..36edec7
--- 1/addons/web/static/src/js/views.js
--- 2/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@@ -1144,13 -1148,7 +1148,7 @@@ session.web.View = session.web.Widget.e
      },
      sidebar_context: function () {
          return $.Deferred().resolve({}).promise();
--    },
- 
-     do_push_state: function(state, overwrite) {
-     },
- 
-     do_load_state: function(state) {
 +    }
  });
  
  session.web.json_node_to_xml = function(node, human_readable, indent) {