[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 3 Oct 2011 14:45:03 +0000 (16:45 +0200)
committerVo Minh Thu <vmt@openerp.com>
Mon, 3 Oct 2011 14:45:03 +0000 (16:45 +0200)
commit7b90c7e5ded476899833f312556f6f135e983924
tree4ca77d2dc8925e365b63f3e15c9590f53376366b
parent7101204a2255e2686cf35dd40d190ff8fcfcfc92
parentf4ffbd79f417c6445b630a5a33979321dba67cc0
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20111003144503-lx28ennrz0mt590g
openerp/osv/orm.py