[FIX] product: correct SyntaxError made by kdiff3 (once again) during previous forward port
Merge branch 'master' of https://github.com/odoo/odoo into master-linux64