[MERGE] addons import hook: give precedence to our own modules, let them shadow other Python modules.
[MERGE] addons import hook: give precedence to our own modules, let them shadow other Python modules.
splbio/openobject-server,ovnicraft/openerp-server,vnc-biz/openerp-server,gisce/openobject-server,splbio/openobject-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,vnc-biz/openerp-server,MarkusTeufelberger/openobject-server,ovnicraft/openerp-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server