bzr revid: pfrost@openerpdev-20130103231005-56pglti6uss0jsm5
bzr revid: al@openerp.com-20120815224708-rcge3914klkwrw6u