Merge proposals

shorewall-init in Ubuntu has no merge proposals.