Merge https://code.launchpad.net/~savoirfairelinux-openerp/openerp-shared/7.0/+merge/238441