[MERGE]merge with main branch.

bzr revid: vme@tinyerp.com-20111209055746-gel0yr4aum3gb76k

diff --cc addons/web/static/src/js/views.js
index 5d55fff,bdc1eeb..0d8621d
--- 1/addons/web/static/src/js/views.js
--- 2/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@@ -480,10 -498,10 +503,10 @@@ session.web.ViewManagerAction = session
              self.$element.find('.oe-view-manager-logs:first')
                  .addClass('oe-folded').removeClass('oe-has-more')
                  .find('ul').empty();
-             self.shortcut_check(self.views[view_type])
++            self.shortcut_check(self.views[view_type]);
          });
          return $.when(
 -                switched,
 -                this.shortcut_check(this.views[view_type])
 +                switched
              ).then(function() {
                  var controller = self.views[self.active_view].controller,
                      fvg = controller.fields_view,