Merge proposals

rinetd in Ubuntu has no merge proposals.