[MERGE]merge main view editor branch upto 871 revision.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Tue, 4 Oct 2011 05:42:16 +0000 (11:12 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Tue, 4 Oct 2011 05:42:16 +0000 (11:12 +0530)
commit87436d725e9d8fbbe88b31333e4e077b3ad3759a
treeb4e941e65c64dab1e3f9ee7489c178916b5a189e
parent7e9e542418f791b024de401236eeb8e006be42d4
parent4172b1bde01adb3864273005d9431486e4099896
[MERGE]merge main view editor branch upto 871 revision.

bzr revid: kch@tinyerp.com-20110927131705-x1je8pg2peg7apar
bzr revid: kch@tinyerp.com-20111004054216-qt2vfni9t3b60s6q
addons/web/static/src/js/view_editor.js
addons/web/static/src/xml/base.xml