[MERGE] trunk

bzr revid: al@openerp.com-20120801142851-kmc1obvwu6kdwdin

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

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

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

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

diff --cc addons/web_kanban/static/src/css/kanban.css
Simple merge

diff --cc addons/web_kanban/static/src/css/kanban.sass
Simple merge

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge