merge upstream

bzr revid: chs@openerp.com-20121108163458-wk7p4mf7fyh3winl

diff --cc addons/web/__openerp__.py
Simple merge

diff --cc addons/web/static/src/js/chrome.js
index 7fe750d,9c249a5..f103828
--- 1/addons/web/static/src/js/chrome.js
--- 2/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@@ -1189,12 -1176,9 +1197,12 @@@ instance.web.EmbeddedClient = instance.
      },
      start: function() {
          var self = this;
-         return $.when(this._super()).pipe(function() {
-             return self.authenticate().pipe(function() {
+         return $.when(this._super()).then(function() {
 -            return instance.session.session_authenticate(self.dbname, self.login, self.key, true).then(function() {
 -                return self.rpc("/web/action/load", { action_id: self.action_id }).done(function(result) {
++            return self.authenticate().then(function() {
 +                if (!self.action_id) {
 +                    return;
 +                }
 +                return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) {
                      var action = result;
                      action.flags = _.extend({
                          //views_switcher : false,

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

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