[MERGE] Merge with trunk upto revision no 657.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 20 Jul 2011 04:40:41 +0000 (10:10 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 20 Jul 2011 04:40:41 +0000 (10:10 +0530)
commit49b249510ce3a1a82745e82d5c531928292cf629
tree77b2bae856f5ff6f8e779772a38621a76a709d46
parentc1546ac368be928f990f261263eb163cae1fe72e
parent906a94c3c788ce7d4de67415a51e55e49c46156a
[MERGE] Merge with trunk upto revision no 657.

bzr revid: ysa@tinyerp.com-20110720044041-w2b88qfhjwo0qjgk
addons/base/static/src/js/chrome.js
addons/base/static/src/js/views.js