[MERGE] from trunk

bzr revid: xmo@openerp.com-20110822134905-iydp9c1l36nif1iw

diff --cc addons/base/static/src/js/formats.js
Simple merge

diff --cc addons/base/static/src/xml/base.xml
Simple merge

diff --cc addons/base/static/test/test.html
index 08ca652,809a3d2..9c741eb
--- 1/addons/base/static/test/test.html
--- 2/addons/base/static/test/test.html
+++ b/addons/base/static/test/test.html
@@@ -40,5 -44,5 +44,6 @@@
      <script type="text/javascript" src="/base/static/test/class.js"></script>
      <script type="text/javascript" src="/base/static/test/registry.js"></script>
      <script type="text/javascript" src="/base/static/test/form.js"></script>
 +    <script type="text/javascript" src="/base/static/test/list-utils.js"></script>
+     <script type="text/javascript" src="/base/static/test/formats.js"></script>
  </html>