[MERGE] merged openerp-dev-addons1 branch