[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 28 Mar 2013 09:24:14 +0000 (10:24 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 28 Mar 2013 09:24:14 +0000 (10:24 +0100)
bzr revid: tde@openerp.com-20130328092414-htawc7j3jrxte866

1  2 
openerp/addons/base/ir/ir_actions.py
openerp/osv/orm.py

Simple merge
Simple merge