[MERGE] from trunk

bzr revid: rco@openerp.com-20130213082352-t3wbhkxfh3z10ukt

diff --cc doc/index.rst
index 0040394,83b3837..5dbea31
--- 1/doc/index.rst
--- 2/doc/index.rst
+++ b/doc/index.rst
@@@ -34,8 -35,16 +35,17 @@@ OpenERP Server AP
  .. toctree::
     :maxdepth: 1
  
 +   orm-methods.rst
     api_models.rst
+    routing.rst
+ 
+ Changelog
+ '''''''''
+ 
+ .. toctree::
+    :maxdepth: 1
+ 
+    changelog.rst
  
  Concepts
  ''''''''

diff --cc openerp/osv/orm.py
Simple merge