bzr revid: jke@openerp.com-20131217121808-miv2zlo2guuxrt1r
bzr revid: jke@openerp.com-20131123113627-csxj0qx8s030dhi7