[MERGE] Port the improvements of version 6.1 in 7.0
Merge branch 'master' of github.com:Smile-SA/smile_openerp_addons_7.0

Conflicts:
	smile_base/orm.py