[MERGE] Merge with trunk upto revision no 1184.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Mon, 10 Oct 2011 05:00:54 +0000 (10:30 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Mon, 10 Oct 2011 05:00:54 +0000 (10:30 +0530)
commit82dfc1516034c086115c90b33c6d22c3a07c1bd5
tree6d1f938023f474ce22293dc39be6a05c327bc04f
parentaad669d89e59be36443d7886ea21acfb064c78ac
parent9bd11f5031328c73f4a045521a0cb88ed74928f3
[MERGE] Merge with trunk upto revision no 1184.

bzr revid: ysa@tinyerp.com-20111010050054-hvwr29706js07cmb
addons/web/__openerp__.py
addons/web/static/src/css/base.css
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml