[Merge] Merged with main branch.

bzr revid: noz@tinyerp.com-20110719115409-pdha2nr3o7eyss22

diff --cc addons/base/controllers/main.py
Simple merge

diff --cc addons/base/static/src/base.html
Simple merge

diff --cc addons/base/static/src/js/chrome.js
index 6009ec2,33aa311..06fb0d6
--- 1/addons/base/static/src/js/chrome.js
--- 2/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@@ -979,9 -692,8 +943,9 @@@ openerp.base.Database = openerp.base.Co
  
  openerp.base.Login =  openerp.base.Controller.extend({
      remember_creditentials: true,
 +    
-     init: function(session, element_id) {
-         this._super(session, element_id);
+     init: function(parent, element_id) {
+         this._super(parent, element_id);
          this.has_local_storage = typeof(localStorage) != 'undefined';
          this.selected_db = null;
          this.selected_login = null;
@@@ -1204,9 -899,8 +1166,9 @@@ openerp.base.WebClient = openerp.base.C
          this.session.on_session_valid.add_last(this.header.do_update);
          this.session.on_session_valid.add_last(this.on_logged);
  
-         this.menu = new openerp.base.Menu(this.session, "oe_menu", "oe_secondary_menu");
+         this.menu = new openerp.base.Menu(this, "oe_menu", "oe_secondary_menu");
          this.menu.on_action.add(this.on_menu_action);
 +        
      },
      start: function() {
          this.session.start();