Merge proposals

Meera Trambadia (OpenERP) has no merge proposals.