[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Tue, 10 Jan 2012 15:43:33 +0000 (16:43 +0100)
committerVo Minh Thu <vmt@openerp.com>
Tue, 10 Jan 2012 15:43:33 +0000 (16:43 +0100)
commitdaa41b61c10145ba14c4940c3e8b6431d3b9b7b5
tree7b4368a6620f2fd86d9bafb74b6437696fc7e548
parent013794b978f8bf4a499f564412d19e59304108eb
parent8ac7936990911ad2649c6faf1efafcf2667d6a6c
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120110154333-kdwsff0faftcwvku
openerp/osv/orm.py
setup.py