[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 16 Jan 2012 11:04:34 +0000 (12:04 +0100)
committerVo Minh Thu <vmt@openerp.com>
Mon, 16 Jan 2012 11:04:34 +0000 (12:04 +0100)
commit0ed4377cf84eb9f9c8176781daf3811a2e968c7a
tree810b558b2a3b3886c72f07f003e64bfdb5324151
parent6c1ad196bf39563d62159ef1b988af39360849aa
parent9b02aed518a1fe65ff49679ee915f55cdcc6c319
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120112155027-u3bagec0g9fqr0yi
bzr revid: vmt@openerp.com-20120116110434-ckhp01ze83cwm32y
openerp-server
openerp/osv/orm.py