Merge proposals

partman-jfs has no merge proposals.