Merge proposals

openerp-crc has no merge proposals.