[MERGE]Merge with trunk upto revision no 750.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Tue, 9 Aug 2011 06:25:29 +0000 (11:55 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Tue, 9 Aug 2011 06:25:29 +0000 (11:55 +0530)
bzr revid: kch@tinyerp.com-20110809062529-w88bfh3nstwtnf3g

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

Simple merge