[MERGE] Merged with web/trunk.
[MERGE] Merged with web/trunk.

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