[MERGE]merge with trunk
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Fri, 27 Jul 2012 05:01:54 +0000 (10:31 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Fri, 27 Jul 2012 05:01:54 +0000 (10:31 +0530)
commit8220b2edf94db13e85b9bb10dd95559be32fd22e
tree9f2bb2e6247c9cf16fa15ee011cf4877ba4dca40
parent730d5555f6b8766c0f5871d89b5eb8e14d74dfa5
parent9128e37231194592b6468ffa7922bbb39b5d7a33
[MERGE]merge with trunk

bzr revid: sgo@tinyerp.com-20120727050154-148msw0jzppgc66w
addons/web/static/src/js/view_form.js
addons/web/static/src/xml/base.xml