[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Wed, 20 Mar 2013 13:31:55 +0000 (14:31 +0100)
committerChristophe Matthieu <chm@openerp.com>
Wed, 20 Mar 2013 13:31:55 +0000 (14:31 +0100)
commit45cc77dbcbbcc3e6c3a0e5fbeb19669c879e0ef7
tree89d3d1c251a95ad3abdd57e35a665ec457db0bb3
parenta37aea3a857e639c5309c83537ec1e953449a860
parent027c419181c2287a640b51ed6d4f4a41797ccdf8
[MERGE] from trunk

bzr revid: chm@openerp.com-20130320133155-qn27q8aek7zp1ls4
openerp/osv/orm.py