first openerp commit
fix merge issue