The on-going dispute between the French region of Champagne and a Swiss village by the same name over who has the right to call their wine Champagne seems to have been resolved for the moment.