[MERGE] Merged with branch holding mail-state update.
[MERGE] Merged with branch holding mail-state update.
MarkusTeufelberger/openerp-web,gisce/openerp-web,splbio/openerp-web,MarkusTeufelberger/openerp-web,gisce/openerp-web,gisce/openerp-web,splbio/openerp-web,MarkusTeufelberger/openerp-web,splbio/openerp-web