[MERGE]Merge with trunk upto revision no 855.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Thu, 25 Aug 2011 05:44:08 +0000 (11:14 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Thu, 25 Aug 2011 05:44:08 +0000 (11:14 +0530)
bzr revid: kch@tinyerp.com-20110825054408-0b7063yvldh60u05

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

Simple merge
Simple merge
Simple merge
Simple merge