[FIX] base: python 2.6 incompatibility for dictionary comprehension
Merge branch '7.0' of https://github.com/odoo/odoo into 7.0-win32