[MERGE] trunk

bzr revid: al@openerp.com-20120725082646-ff6ljt0pquvm0dup

diff --cc addons/web/static/src/js/coresetup.js
Simple merge

diff --cc addons/web/static/src/js/search.js
Simple merge

diff --cc addons/web/static/test/test.html
index dd0d08a,cab1586..95518db
--- 1/addons/web/static/test/test.html
--- 2/addons/web/static/test/test.html
+++ b/addons/web/static/test/test.html
@@@ -55,5 -61,5 +61,6 @@@
      <script type="text/javascript" src="/web/static/test/rpc.js"></script>
      <script type="text/javascript" src="/web/static/test/evals.js"></script>
      <script type="text/javascript" src="/web/static/test/search.js"></script>
 +    <script type="text/javascript" src="/web/static/test/Widget.js"></script>
+     <script type="text/javascript" src="/web/static/test/list-editable.js"></script>
  </html>

diff --cc doc/index.rst
index 1f66042,8608af5..0c98815
--- 1/doc/index.rst
--- 2/doc/index.rst
+++ b/doc/index.rst
@@@ -16,9 -16,11 +16,12 @@@ Contents
      async
      rpc
  
 +    widget
      search-view
  
+     list-view
+     form-notes
+ 
  Older stuff
  -----------