[MERGE] Merge with trunk

.bzrignore

addons/web/__init__.py

addons/web/__openerp__.py

addons/web/common/dispatch.py

addons/web/common/openerplib/main.py

addons/web/common/session.py

addons/web/controllers/main.py

addons/web/static/lib/py.parse/.hg_archival.txt

addons/web/static/lib/py.parse/README

addons/web/static/lib/py.parse/TODO.rst

addons/web/static/lib/py.parse/lib/py.js

addons/web/static/lib/py.parse/test/test.js

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

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

addons/web/static/src/js/core.js

addons/web/static/src/js/data.js

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

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

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

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