[REM] merge conflict file committed
[REM] merge conflict file committed


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