This should be the last major template sync before the final release of 6.1. bzr revid: odo@openerp.com-20120208010830-zchnkg48u7s40nw2
bzr revid: odo@openerp.com-20111222185539-9gn06tu38ynoc416