[MERGE] Merged with mail-state, recently updated with trunk.
[MERGE] Merged with mail-state, recently updated with trunk.

akretion/openerp-web,havt/openerp-web,havt/openerp-web,havt/openerp-web,akretion/openerp-web,akretion/openerp-web,havt/openerp-web,havt/openerp-web