Merge proposals

cvs-mailcommit in Ubuntu has no merge proposals.