[MERGE]merge with main branch.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Fri, 11 Nov 2011 05:37:03 +0000 (11:07 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Fri, 11 Nov 2011 05:37:03 +0000 (11:07 +0530)
commit6bf24d1890eefcf168fdd4959565a3756ec0950e
tree0f559c2573d26b372a99dddf9137fea9bf16da00
parentd5c21085f91cb2e360e6f769e66b9add05206d57
parent453f747b1dda7ddcd9a2f2f3a627af3a12a33247
[MERGE]merge with main branch.

bzr revid: vme@tinyerp.com-20111111053703-r8gx2w67t0w38jp7
addons/web/static/src/js/view_editor.js