[FIX] fields.py - avoid dict comprehension inside a dict comprehension
Merge branch '7.0' of https://github.com/odoo/odoo into 7.0-linux64