[MERGE] small refactoring from trunk
[MERGE] small refactoring from trunk

--HG--
extra : convert_revision : xmo%40openerp.com-20110328083153-k6eerom6hbus01gz


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