[merge]Merge trunk upto rev no 849.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Tue, 23 Aug 2011 09:10:43 +0000 (14:40 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Tue, 23 Aug 2011 09:10:43 +0000 (14:40 +0530)
bzr revid: vme@tinyerp.com-20110823091043-n044jstpagjbgyfm

1  2 
addons/base/static/src/js/chrome.js
addons/base/static/src/js/views.js

Simple merge
Simple merge