[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Wed, 4 Jan 2012 13:10:10 +0000 (14:10 +0100)
committerVo Minh Thu <vmt@openerp.com>
Wed, 4 Jan 2012 13:10:10 +0000 (14:10 +0100)
commit389257c0090a9bcd00ff22079e9fff2b32b2f59a
tree90e2748c3d367800db5dc7817806717f5facc732
parent22c0a0f8cc1dd7fbd4716527930cef07505709a7
parente9e419089e879141525ad0c7d5ea11abba4e3e6d
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120104131010-kbw2ej2rrdvyif96
openerp/modules/graph.py
openerp/modules/loading.py
setup.py