[MERGE] sync with trunk
authorOlivier Dony <odo@openerp.com>
Thu, 22 Dec 2011 10:25:55 +0000 (11:25 +0100)
committerOlivier Dony <odo@openerp.com>
Thu, 22 Dec 2011 10:25:55 +0000 (11:25 +0100)
commitd925235e6233995fd643af6318bf318256cfd11f
treeedeb13e9498dbeffebfc737256d2b72ff193c6d0
parentbe65d63f544c66b05b4d0b3b9baf1ed2e15655af
parent0eb2986e159bb1d2dd315e290589392d7f182573
[MERGE] sync with trunk

bzr revid: odo@openerp.com-20111222102555-bydsozbdu6urkj31
openerp/addons/base/base.sql
openerp/addons/base/ir/ir.xml
openerp/addons/base/ir/ir_model.py
openerp/osv/fields.py
openerp/osv/orm.py
setup.py