bzr revid: chm@openerp.com-20120907091708-z9x8g9tzdu6e7oad
bzr revid: acl@openerp.com-20120813170429-91dibb1dpe32j6w2