[MERGE] Forwardport of fix from 6.1 revision 4334 that sometimes caused an import error when starting a cron
[MERGE] Forwardport of fix from 6.1 revision 4334 that sometimes caused an import error when starting a cron

akretion/openerp-server,akretion/openerp-server,akretion/openerp-server