[MERGE] changes required for the "import hook" commit in the server.
authorVo Minh Thu <vmt@openerp.com>
Wed, 18 Jan 2012 10:46:35 +0000 (11:46 +0100)
committerVo Minh Thu <vmt@openerp.com>
Wed, 18 Jan 2012 10:46:35 +0000 (11:46 +0100)
commit7f6df68536f92e9138607f47e3c567a70e878e73
treed584fa3803aff1d4bc4b8c96af049c6a5ae37846
parent14acff6cc493e75e53e38cf12a8619dbe7e76716
parent1064cda2dcac0d2043179803277535a223b54f7c
[MERGE] changes required for the "import hook" commit in the server.

bzr revid: vmt@openerp.com-20120118104635-mn4vca0xw2b9s8w2