[MERGE] from trunk, in order to get some dataset & groupby fixes

bzr revid: xmo@openerp.com-20110706142536-dwxuq2v10u660703

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

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

diff --cc addons/base/static/src/js/chrome.js
Simple merge

diff --cc addons/base/static/src/js/data.js
Simple merge

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