lp bug: https://launchpad.net/bugs/987358 fixed bzr revid: fme@openerp.com-20120619093249-g6eexljq3bhyd037
lp bug: https://launchpad.net/bugs/928918 fixed bzr revid: fme@openerp.com-20120214105145-pat0srumt8m7nq38