Merge proposals

cvs-buildpackage in Ubuntu has no merge proposals.