[MERGE] Merge with lp:openobject-server

bzr revid: sbh@tinyerp.com-20120306083420-r2br7skl91w78ueo

diff --cc doc/index.rst
index 0000000,efa4d1c..5d5b4f8
mode 000000,100644..100644
--- /dev/null
--- 2/doc/index.rst
+++ b/doc/index.rst
@@@ -1,0 -1,27 +1,6 @@@
 -.. OpenERP Web documentation master file, created by
 -   sphinx-quickstart on Fri Mar 18 16:31:55 2011.
 -   You can adapt this file completely to your liking, but it should at least
 -   contain the root `toctree` directive.
++:orphan:
+ 
 -Welcome to OpenERP Web's documentation!
++OpenERP Server Developers Documentation
+ =======================================
+ 
 -Contents:
 -
 -.. toctree::
 -   :maxdepth: 2
 -
 -   getting-started
 -   production
 -   widgets
 -   addons
 -   development
 -   project
 -   old-version
 -
 -Indices and tables
 -==================
 -
 -* :ref:`genindex`
 -* :ref:`modindex`
 -* :ref:`search`
++.. include:: index.rst.inc

diff --cc openerp/addons/base/test/test_osv_expression.yml
Simple merge