[MERGE] sync with trunk
authorOlivier Dony <odo@openerp.com>
Wed, 5 Sep 2012 22:01:58 +0000 (00:01 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 5 Sep 2012 22:01:58 +0000 (00:01 +0200)
commit8e96d71bf339380c531228bb93e630b56b2e2558
tree63593f1cd97c9a2ed91235dc864e2cb3335559ba
parent43eb05242f0026f7b8742136dcfd2801f0125187
parent8d1e3d06abae19598ce1bd854789327f56ef2536
[MERGE] sync with trunk

bzr revid: odo@openerp.com-20120905072646-m4269m97ej1oicoq
bzr revid: odo@openerp.com-20120905220158-ulg8jy5alny97ff3
openerp/addons/base/ir/ir.xml
openerp/addons/base/res/res_partner_view.xml
openerp/osv/orm.py
openerp/tests/__init__.py