Some things missed by commit 8b67a7202d
8b67a7202d
bzr revid: stw@openerp.com-20120529133642-td13jd3sxwi0cbj0