bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
bzr revid: rco@openerp.com-20120510100957-kgxbpmurc1sgswuz
This should be the last major template sync before the final release of 6.1. bzr revid: odo@openerp.com-20120208010830-zchnkg48u7s40nw2