Merge proposals

libcdio has no merge proposals.