[TYPO] Stupid typo...
Merge branch '7.0' of https://github.com/odoo/odoo into 7.0-win32