[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Wed, 5 Oct 2011 08:00:49 +0000 (10:00 +0200)
committerVo Minh Thu <vmt@openerp.com>
Wed, 5 Oct 2011 08:00:49 +0000 (10:00 +0200)
commit6067cd3609e489c914f05a14dea243579325daa2
tree2b16d80ced4f7577e81359f512a9161a137a50d2
parent2cb580673c082459ba77b92ef59995a338c59282
parentce903eb54a0616273afd9d9d08a62f386928811d
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20111005080049-mv0ml30tti01cvba
openerp/osv/orm.py