[REVERT] revert previous commit which:
1. is wrong
2. break runbot
[MERGE] forward port of branch 7.0 up to revid 4075 chs@openerp.com-20131122170316-lbuxddprrgz1are3