[MERGE] addons import hook: give precedence to our own modules, let them shadow other...
authorVo Minh Thu <vmt@openerp.com>
Fri, 10 Feb 2012 09:48:12 +0000 (10:48 +0100)
committerVo Minh Thu <vmt@openerp.com>
Fri, 10 Feb 2012 09:48:12 +0000 (10:48 +0100)
bzr revid: vmt@openerp.com-20120210094812-7lewrxwpqfrlmke1


Trivial merge