test
Merge https://github.com/mraopenerp/openerp