[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)
bzr revid: vmt@openerp.com-20120118104635-mn4vca0xw2b9s8w2


Trivial merge