See individual commit message for more info bzr revid: odo@openerp.com-20120813151648-gvxggkz0dnj3y6ax