[MERGE] trunk

addons/web/__openerp__.py

addons/web/common/http.py

addons/web/controllers/main.py

addons/web/i18n/fr_CA.po

addons/web/i18n/pt_BR.po

addons/web/static/lib/spinjs/spin.js

addons/web/static/src/css/base.css

addons/web/static/src/css/base.sass

addons/web/static/src/img/throbber.gif

addons/web/static/src/js/chrome.js

addons/web/static/src/js/corelib.js

addons/web/static/src/js/coresetup.js

addons/web/static/src/js/search.js

addons/web/static/src/js/view_form.js

addons/web/static/src/js/view_list.js

addons/web/static/src/js/view_list_editable.js

addons/web/static/src/js/views.js

addons/web/static/src/xml/base.xml

addons/web_calendar/__openerp__.py

addons/web_dashboard/__openerp__.py