[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)
commit6815ad29a880450f9ffea1830a24638a0293986a
tree5b3ee4becc34a756b8d5f55ea0bbc134e286a87c
parenta97bb0476ca74b2fa43bc58d408b68d78477610e
parentf11f0dd9e30e5596aa71174f01dfc0e2fa1a1d6e
[merge]Merge trunk upto rev no 849.

bzr revid: vme@tinyerp.com-20110823091043-n044jstpagjbgyfm
addons/base/static/src/js/chrome.js
addons/base/static/src/js/views.js