[CalendarServer-changes] [7043] CalendarServer/trunk/twistedcaldav/zoneinfo

[source_changes at macosforge.org]

Revision: 7043
          http://trac.macosforge.org/projects/calendarserver/changeset/7043
Author:   cdaboo at apple.com
Date:     2011-02-17 18:43:37 -0800 (Thu, 17 Feb 2011)
Log Message:
-----------
Update to Olson 2011b timezone data.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Abidjan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Accra.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Addis_Ababa.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Algiers.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmara.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmera.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bamako.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bangui.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Banjul.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bissau.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Blantyre.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Brazzaville.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bujumbura.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Cairo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Casablanca.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ceuta.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Conakry.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dakar.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dar_es_Salaam.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Djibouti.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Douala.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/El_Aaiun.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Freetown.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Gaborone.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Harare.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Johannesburg.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kampala.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Khartoum.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kigali.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kinshasa.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lagos.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Libreville.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lome.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Luanda.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lubumbashi.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lusaka.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Malabo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maputo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maseru.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mbabane.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mogadishu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Monrovia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nairobi.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ndjamena.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Niamey.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nouakchott.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ouagadougou.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Porto-Novo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Sao_Tome.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Timbuktu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tripoli.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tunis.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Windhoek.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Adak.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anchorage.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anguilla.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Antigua.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Araguaina.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Buenos_Aires.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Catamarca.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/ComodRivadavia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Cordoba.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Jujuy.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/La_Rioja.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Mendoza.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Rio_Gallegos.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Salta.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Juan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Luis.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Tucuman.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Ushuaia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Aruba.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Asuncion.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atikokan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atka.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Barbados.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belem.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belize.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Blanc-Sablon.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boa_Vista.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bogota.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boise.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Buenos_Aires.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cambridge_Bay.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Campo_Grande.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cancun.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Caracas.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Catamarca.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayenne.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayman.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chicago.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chihuahua.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Coral_Harbour.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cordoba.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Costa_Rica.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cuiaba.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Curacao.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Danmarkshavn.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson_Creek.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Denver.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Detroit.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dominica.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Edmonton.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Eirunepe.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/El_Salvador.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ensenada.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fort_Wayne.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fortaleza.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Glace_Bay.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Godthab.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Goose_Bay.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grand_Turk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grenada.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guadeloupe.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guatemala.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guayaquil.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guyana.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Halifax.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Havana.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Hermosillo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Indianapolis.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Knox.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Marengo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Petersburg.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Tell_City.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vevay.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vincennes.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Winamac.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indianapolis.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Inuvik.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Iqaluit.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jamaica.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jujuy.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Juneau.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Louisville.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Monticello.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Knox_IN.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/La_Paz.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lima.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Los_Angeles.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Louisville.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Maceio.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Managua.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Manaus.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Marigot.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Martinique.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mazatlan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mendoza.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Menominee.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Merida.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mexico_City.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Miquelon.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Moncton.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Monterrey.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montevideo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montreal.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montserrat.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nassau.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/New_York.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nipigon.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nome.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Noronha.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Center.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/New_Salem.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Panama.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Pangnirtung.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Paramaribo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Phoenix.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port-au-Prince.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port_of_Spain.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Acre.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Velho.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Puerto_Rico.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rainy_River.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rankin_Inlet.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Recife.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Regina.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Resolute.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rio_Branco.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rosario.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santarem.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santiago.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santo_Domingo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Sao_Paulo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Scoresbysund.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Shiprock.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Barthelemy.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Johns.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Kitts.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Lucia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Thomas.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Vincent.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Swift_Current.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tegucigalpa.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thule.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thunder_Bay.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tijuana.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Toronto.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tortola.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Vancouver.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Virgin.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Whitehorse.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Winnipeg.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yakutat.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yellowknife.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Casey.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Davis.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/DumontDUrville.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Mawson.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/McMurdo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Palmer.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Rothera.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/South_Pole.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Syowa.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Vostok.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Arctic/Longyearbyen.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aden.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Almaty.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Amman.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Anadyr.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtau.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtobe.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ashgabat.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ashkhabad.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baghdad.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bahrain.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baku.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bangkok.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Beirut.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bishkek.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Brunei.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Calcutta.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Choibalsan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chongqing.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chungking.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Colombo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dacca.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Damascus.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dhaka.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dili.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dubai.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dushanbe.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Gaza.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Harbin.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ho_Chi_Minh.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hong_Kong.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hovd.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Irkutsk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Istanbul.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jakarta.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jayapura.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jerusalem.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kabul.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kamchatka.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Karachi.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kashgar.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Katmandu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kolkata.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Krasnoyarsk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuala_Lumpur.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuching.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuwait.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macao.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macau.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Magadan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Makassar.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Manila.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Muscat.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Nicosia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novosibirsk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Omsk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Oral.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Phnom_Penh.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pontianak.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pyongyang.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qatar.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qyzylorda.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Rangoon.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Riyadh.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Saigon.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Sakhalin.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Samarkand.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Seoul.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Shanghai.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Singapore.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Taipei.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tashkent.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tbilisi.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tehran.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tel_Aviv.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimbu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimphu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tokyo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ujung_Pandang.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulaanbaatar.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulan_Bator.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Urumqi.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vientiane.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vladivostok.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yakutsk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yekaterinburg.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yerevan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Azores.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Bermuda.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Canary.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Cape_Verde.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faeroe.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faroe.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Jan_Mayen.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Madeira.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Reykjavik.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/South_Georgia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/St_Helena.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Stanley.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/ACT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Adelaide.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Brisbane.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Broken_Hill.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Canberra.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Currie.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Darwin.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Eucla.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Hobart.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/LHI.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lindeman.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lord_Howe.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Melbourne.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/NSW.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/North.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Perth.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Queensland.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/South.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Sydney.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Tasmania.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Victoria.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/West.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Yancowinna.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/Acre.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/DeNoronha.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/East.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/West.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Atlantic.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Central.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/East-Saskatchewan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Eastern.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Mountain.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Newfoundland.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Pacific.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Saskatchewan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Yukon.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/Continental.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/EasterIsland.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Cuba.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Egypt.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Eire.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Amsterdam.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Andorra.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Athens.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belfast.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belgrade.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Berlin.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bratislava.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Brussels.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bucharest.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Budapest.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Chisinau.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Copenhagen.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Dublin.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Gibraltar.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Guernsey.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Helsinki.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Isle_of_Man.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Istanbul.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Jersey.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kaliningrad.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kiev.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Lisbon.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Ljubljana.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/London.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Luxembourg.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Madrid.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Malta.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Mariehamn.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Minsk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Monaco.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Moscow.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Nicosia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Oslo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Paris.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Podgorica.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Prague.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Riga.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Rome.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Samara.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/San_Marino.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sarajevo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Simferopol.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Skopje.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sofia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Stockholm.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tallinn.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tirane.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tiraspol.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Uzhgorod.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vaduz.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vatican.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vienna.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vilnius.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Volgograd.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Warsaw.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zagreb.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zaporozhye.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zurich.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/GB-Eire.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/GB.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Hongkong.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Iceland.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Antananarivo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Chagos.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Christmas.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Cocos.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Comoro.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Kerguelen.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mahe.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Maldives.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mauritius.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mayotte.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Reunion.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Iran.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Israel.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Jamaica.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Japan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Kwajalein.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Libya.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaNorte.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaSur.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/General.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/NZ-CHAT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/NZ.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Navajo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/PRC.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Apia.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Auckland.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chatham.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Easter.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Efate.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Enderbury.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fakaofo.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fiji.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Funafuti.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Galapagos.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Gambier.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guadalcanal.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guam.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Honolulu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Johnston.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kiritimati.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kosrae.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kwajalein.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Majuro.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Marquesas.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Midway.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Nauru.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Niue.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Norfolk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Noumea.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pago_Pago.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Palau.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pitcairn.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Ponape.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Port_Moresby.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Rarotonga.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Saipan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Samoa.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tahiti.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tarawa.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tongatapu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Truk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wake.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wallis.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Yap.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Poland.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Portugal.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/ROC.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/ROK.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Singapore.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Turkey.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Alaska.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Aleutian.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Arizona.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Central.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/East-Indiana.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Eastern.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Hawaii.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Indiana-Starke.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Michigan.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Mountain.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Pacific.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/US/Samoa.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/W-SU.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/version.txt

Added Paths:
-----------
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia_Banderas.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Matamoros.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Beulah.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ojinaga.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santa_Isabel.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Macquarie.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kathmandu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novokuznetsk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/CET.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/CST6CDT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/EET.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/EST.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/EST5EDT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+0.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+1.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+10.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+11.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+12.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+2.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+3.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+4.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+5.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+6.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+7.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+8.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+9.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-0.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-1.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-10.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-11.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-12.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-13.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-14.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-2.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-3.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-4.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-5.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-6.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-7.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-8.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-9.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT0.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Greenwich.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UCT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UTC.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Universal.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Zulu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/GMT+0.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/GMT-0.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/GMT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/GMT0.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Greenwich.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/HST.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/MET.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/MST.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/MST7MDT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/PST8PDT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chuuk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pohnpei.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/UCT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/UTC.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Universal.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/WET.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Zulu.ics

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Abidjan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Abidjan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Abidjan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Abidjan
 X-LIC-LOCATION:Africa/Abidjan
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
 TZOFFSETFROM:-001608
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Accra.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Accra.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Accra.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Accra
 X-LIC-LOCATION:Africa/Accra
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+TZNAME:S
+TZOFFSETFROM:-000052
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19360901T000000
+RRULE:FREQ=YEARLY;UNTIL=19420901T000000Z;BYMONTH=9
+TZNAME:GHST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0020
-TZNAME:GHST
-DTSTART:19360901T000000
-RRULE:FREQ=YEARLY;UNTIL=19420901T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19361231T000000
+RRULE:FREQ=YEARLY;UNTIL=19421230T234000Z;BYMONTH=12
+TZNAME:GMT
 TZOFFSETFROM:+0020
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19361231T000000
-RRULE:FREQ=YEARLY;UNTIL=19421230T234000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-000052
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19180101T000000
-RDATE:19180101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Addis_Ababa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Addis_Ababa.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Addis_Ababa.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Addis_Ababa
 X-LIC-LOCATION:Africa/Addis_Ababa
 BEGIN:STANDARD
+DTSTART:18700101T000000
+RDATE:18700101T000000
+TZNAME:ADMT
 TZOFFSETFROM:+023448
 TZOFFSETTO:+023520
-TZNAME:ADMT
-DTSTART:18700101T000000
-RDATE:18700101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19360505T000000
+RDATE:19360505T000000
+TZNAME:EAT
 TZOFFSETFROM:+023520
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19360505T000000
-RDATE:19360505T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Algiers.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Algiers.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Algiers.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,41 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Algiers
 X-LIC-LOCATION:Africa/Algiers
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19161002T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19191005T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
+DTSTART:18910315T000100
+RDATE:18910315T000100
+TZNAME:PMT
 TZOFFSETFROM:+001212
 TZOFFSETTO:+000921
-TZNAME:PMT
-DTSTART:18910315T000100
-RDATE:18910315T000100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110311T000000
+RDATE:19110311T000000
+TZNAME:WEST
 TZOFFSETFROM:+000921
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19110311T000000
-RDATE:19110311T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:WEST
 DTSTART:19160614T230000
 RDATE:19160614T230000
 RDATE:19170324T230000
@@ -47,52 +31,82 @@
 RDATE:19710425T230000
 RDATE:19770506T000000
 RDATE:19800425T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19161002T000000
+RRULE:FREQ=YEARLY;UNTIL=19191005T230000Z;BYDAY=MO;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19201024T000000
 RDATE:19201024T000000
 RDATE:19210622T000000
 RDATE:19391119T010000
 RDATE:19461007T000000
-RDATE:19630414T000000
 RDATE:19710927T000000
-RDATE:19791026T000000
 RDATE:19801031T020000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19400225T020000
+RDATE:19400225T020000
+TZNAME:CEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19400225T020000
-RDATE:19400225T020000
-RDATE:19560129T000000
-RDATE:19810501T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;UNTIL=19450402T010000Z;BYDAY=1MO;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19441008T020000
 RDATE:19441008T020000
 RDATE:19450916T010000
 RDATE:19780922T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19560129T000000
+RDATE:19560129T000000
+RDATE:19810501T000000
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19630414T000000
+RDATE:19630414T000000
+RDATE:19791026T000000
+TZNAME:WEST
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:CET
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19771021T000000
 RDATE:19771021T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19780324T010000
+RDATE:19780324T010000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19780324T010000
-RDATE:19780324T010000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmara.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmara.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmara.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Asmara
 X-LIC-LOCATION:Africa/Asmara
 BEGIN:STANDARD
+DTSTART:18700101T000000
+RDATE:18700101T000000
+TZNAME:AMT
 TZOFFSETFROM:+023532
 TZOFFSETTO:+023532
-TZNAME:AMT
-DTSTART:18700101T000000
-RDATE:18700101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:ADMT
 TZOFFSETFROM:+023532
 TZOFFSETTO:+023520
-TZNAME:ADMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19360505T000000
+RDATE:19360505T000000
+TZNAME:EAT
 TZOFFSETFROM:+023520
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19360505T000000
-RDATE:19360505T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmera.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmera.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmera.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Asmera
 X-LIC-LOCATION:Africa/Asmera
 BEGIN:STANDARD
+DTSTART:18700101T000000
+RDATE:18700101T000000
+TZNAME:AMT
 TZOFFSETFROM:+023532
 TZOFFSETTO:+023532
-TZNAME:AMT
-DTSTART:18700101T000000
-RDATE:18700101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:ADMT
 TZOFFSETFROM:+023532
 TZOFFSETTO:+023520
-TZNAME:ADMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19360505T000000
+RDATE:19360505T000000
+TZNAME:EAT
 TZOFFSETFROM:+023520
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19360505T000000
-RDATE:19360505T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bamako.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bamako.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bamako.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Bamako
 X-LIC-LOCATION:Africa/Bamako
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
 TZOFFSETFROM:-0032
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19340226T000000
-RDATE:19340226T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19600620T000000
+RDATE:19600620T000000
+TZNAME:GMT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19600620T000000
-RDATE:19600620T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bangui.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bangui.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bangui.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Bangui
 X-LIC-LOCATION:Africa/Bangui
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
 TZOFFSETFROM:+011420
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Banjul.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Banjul.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Banjul.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Banjul
 X-LIC-LOCATION:Africa/Banjul
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:BMT
 TZOFFSETFROM:-010636
 TZOFFSETTO:-010636
-TZNAME:BMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19350101T000000
+RDATE:19350101T000000
+TZNAME:WAT
 TZOFFSETFROM:-010636
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19350101T000000
-RDATE:19350101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:GMT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19640101T000000
-RDATE:19640101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bissau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bissau.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bissau.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Bissau
 X-LIC-LOCATION:Africa/Bissau
 BEGIN:STANDARD
+DTSTART:19110526T000000
+RDATE:19110526T000000
+TZNAME:WAT
 TZOFFSETFROM:-010220
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19110526T000000
-RDATE:19110526T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19750101T000000
+RDATE:19750101T000000
+TZNAME:GMT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19750101T000000
-RDATE:19750101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Blantyre.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Blantyre.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Blantyre.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Blantyre
 X-LIC-LOCATION:Africa/Blantyre
 BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:CAT
 TZOFFSETFROM:+0220
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19030301T000000
-RDATE:19030301T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Brazzaville.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Brazzaville.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Brazzaville.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Brazzaville
 X-LIC-LOCATION:Africa/Brazzaville
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
 TZOFFSETFROM:+010108
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bujumbura.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bujumbura.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bujumbura.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Bujumbura
 X-LIC-LOCATION:Africa/Bujumbura
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CAT
 TZOFFSETFROM:+015728
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Cairo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Cairo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Cairo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,131 +1,123 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Cairo
 X-LIC-LOCATION:Africa/Cairo
+BEGIN:STANDARD
+DTSTART:19001001T000000
+RDATE:19001001T000000
+TZNAME:EEST
+TZOFFSETFROM:+0205
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19400715T000000
+RDATE:19400715T000000
+RDATE:19410415T000000
+RDATE:19450416T000000
+RDATE:19570510T000000
+RDATE:19580501T000000
+RDATE:19820725T010000
+RDATE:19830712T010000
+RDATE:19890506T010000
+RDATE:20100910T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19420401T000000
-RRULE:FREQ=YEARLY;UNTIL=19440331T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19401001T000000
+RDATE:19401001T000000
+RDATE:19410916T000000
+RDATE:19421027T000000
+RDATE:20060922T000000
+RDATE:20070907T000000
+RDATE:20080829T000000
+RDATE:20090821T000000
+RDATE:20100811T000000
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19431101T000000
-RRULE:FREQ=YEARLY;UNTIL=19451031T210000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420401T000000
+RRULE:FREQ=YEARLY;UNTIL=19440331T220000Z;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19431101T000000
+RRULE:FREQ=YEARLY;UNTIL=19451031T210000Z;BYMONTH=11
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19571001T000000
-RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z
+RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19590501T010000
+RRULE:FREQ=YEARLY;UNTIL=19810430T230000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19590501T010000
-RRULE:FREQ=YEARLY;UNTIL=19810430T230000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19590930T030000
+RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19590930T030000
-RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19661001T030000
+RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19661001T030000
-RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19840501T010000
+RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19840501T010000
-RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19900501T010000
+RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19900501T010000
-RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19950428T000000
+RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19950428T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1FR
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19950929T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=25,26,27,28,29,30;BYDAY=FR;UNTIL=20020926T210000Z
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1;BYDAY=FR;UNTIL=20020926T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
+RRULE:FREQ=YEARLY;UNTIL=20050929T210000Z;BYDAY=FR;BYYEARDAY=-92,-93,-94,-9
+ 5,-96,-97,-98
 TZNAME:EET
-DTSTART:20030925T230000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1TH;UNTIL=20050929T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20080828T230000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYDAY=-1TH
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0205
-TZOFFSETTO:+0200
+DTSTART:20101001T000000
+RRULE:FREQ=YEARLY;BYDAY=FR;BYYEARDAY=-92,-93,-94,-95,-96,-97,-98
 TZNAME:EET
-DTSTART:19001001T000000
-RDATE:19001001T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19400715T000000
-RDATE:19400715T000000
-RDATE:19410415T000000
-RDATE:19450416T000000
-RDATE:19570510T000000
-RDATE:19580501T000000
-RDATE:19820725T010000
-RDATE:19830712T010000
-RDATE:19890506T010000
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19401001T000000
-RDATE:19401001T000000
-RDATE:19410916T000000
-RDATE:19421027T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20060921T230000
-RDATE:20060921T230000
-RDATE:20070906T230000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Casablanca.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Casablanca.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Casablanca.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,27 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Casablanca
 X-LIC-LOCATION:Africa/Casablanca
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
+BEGIN:STANDARD
+DTSTART:19131026T000000
+RDATE:19131026T000000
 TZNAME:WEST
-DTSTART:19760501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:-003020
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19131026T000000
-RDATE:19131026T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:WEST
 DTSTART:19390912T000000
 RDATE:19390912T000000
 RDATE:19400225T000000
@@ -30,11 +21,13 @@
 RDATE:19740624T000000
 RDATE:19780601T000000
 RDATE:20080601T000000
+RDATE:20090601T000000
+RDATE:20100502T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
 DTSTART:19391119T000000
 RDATE:19391119T000000
 RDATE:19451118T000000
@@ -44,15 +37,33 @@
 RDATE:19760801T000000
 RDATE:19770928T000000
 RDATE:19780804T000000
-RDATE:19860101T000000
 RDATE:20080901T000000
+RDATE:20090821T000000
+RDATE:20100808T000000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z;BYMONTH=5
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:CET
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19840316T000000
 RDATE:19840316T000000
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860101T000000
+RDATE:19860101T000000
+TZNAME:WEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ceuta.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ceuta.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ceuta.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,47 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Ceuta
 X-LIC-LOCATION:Africa/Ceuta
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:WET
+TZOFFSETFROM:-002116
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19261003T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19281006T230000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19180506T230000
+RDATE:19180506T230000
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19760501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19860330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19860928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19181007T230000
+RDATE:19181007T230000
+RDATE:19241005T000000
+RDATE:19671001T000000
+RDATE:19740901T000000
+RDATE:19760801T000000
+RDATE:19770928T000000
+RDATE:19780804T000000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-002116
+DTSTART:19240101T000000
+RDATE:19240101T000000
+RDATE:19290101T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19180506T230000
-RDATE:19180506T230000
+DTSTART:19240416T230000
 RDATE:19240416T230000
 RDATE:19260417T230000
 RDATE:19270409T230000
@@ -59,41 +49,59 @@
 RDATE:19670603T120000
 RDATE:19740624T000000
 RDATE:19780601T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19281006T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19181007T230000
-RDATE:19181007T230000
-RDATE:19241005T000000
-RDATE:19671001T000000
-RDATE:19740901T000000
-RDATE:19760801T000000
-RDATE:19770928T000000
-RDATE:19780804T000000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z;BYMONTH=5
+TZNAME:WEST
 TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19240101T000000
-RDATE:19240101T000000
-RDATE:19290101T000000
-END:STANDARD
+TZOFFSETTO:+0100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19840316T000000
+RDATE:19840316T000000
+TZNAME:CET
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19840316T000000
-RDATE:19840316T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860101T000000
+RDATE:19860101T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19860330T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19860928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
-DTSTART:19860101T000000
-RDATE:19860101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Conakry.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Conakry.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Conakry.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Conakry
 X-LIC-LOCATION:Africa/Conakry
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
 TZOFFSETFROM:-005452
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19340226T000000
-RDATE:19340226T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19600101T000000
+RDATE:19600101T000000
+TZNAME:GMT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19600101T000000
-RDATE:19600101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dakar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dakar.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dakar.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Dakar
 X-LIC-LOCATION:Africa/Dakar
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
 TZOFFSETFROM:-010944
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19410601T000000
+RDATE:19410601T000000
+TZNAME:GMT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19410601T000000
-RDATE:19410601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dar_es_Salaam.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dar_es_Salaam.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dar_es_Salaam.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Dar_es_Salaam
 X-LIC-LOCATION:Africa/Dar_es_Salaam
 BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:EAT
 TZOFFSETFROM:+023708
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19310101T000000
-RDATE:19310101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19480101T000000
+RDATE:19480101T000000
+TZNAME:BEAUT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+024445
-TZNAME:BEAUT
-DTSTART:19480101T000000
-RDATE:19480101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19610101T000000
+RDATE:19610101T000000
+TZNAME:EAT
 TZOFFSETFROM:+024445
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19610101T000000
-RDATE:19610101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Djibouti.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Djibouti.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Djibouti.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Djibouti
 X-LIC-LOCATION:Africa/Djibouti
 BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:EAT
 TZOFFSETFROM:+025236
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19110701T000000
-RDATE:19110701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Douala.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Douala.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Douala.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Douala
 X-LIC-LOCATION:Africa/Douala
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
 TZOFFSETFROM:+003848
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/El_Aaiun.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/El_Aaiun.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/El_Aaiun.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/El_Aaiun
 X-LIC-LOCATION:Africa/El_Aaiun
 BEGIN:STANDARD
+DTSTART:19340101T000000
+RDATE:19340101T000000
+TZNAME:WAT
 TZOFFSETFROM:-005248
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19340101T000000
-RDATE:19340101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19760414T000000
+RDATE:19760414T000000
+TZNAME:WET
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19760414T000000
-RDATE:19760414T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Freetown.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Freetown.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Freetown.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Freetown
 X-LIC-LOCATION:Africa/Freetown
+BEGIN:STANDARD
+DTSTART:18820101T000000
+RDATE:18820101T000000
+TZNAME:FMT
+TZOFFSETFROM:-0053
+TZOFFSETTO:-0053
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19130601T000000
+RDATE:19130601T000000
+TZNAME:S
+TZOFFSETFROM:-0053
+TZOFFSETTO:-0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19350601T000000
+RRULE:FREQ=YEARLY;UNTIL=19420601T010000Z;BYMONTH=6
+TZNAME:SLST
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0020
-TZNAME:SLST
-DTSTART:19350601T000000
-RRULE:FREQ=YEARLY;UNTIL=19420601T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19351001T000000
+RRULE:FREQ=YEARLY;UNTIL=19421001T002000Z;BYMONTH=10
+TZNAME:WAT
 TZOFFSETFROM:-0020
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19351001T000000
-RRULE:FREQ=YEARLY;UNTIL=19421001T002000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570101T000000
+RDATE:19570101T000000
+TZNAME:S
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19570601T000000
+RRULE:FREQ=YEARLY;UNTIL=19620601T000000Z;BYMONTH=6
+TZNAME:SLST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:SLST
-DTSTART:19570601T000000
-RRULE:FREQ=YEARLY;UNTIL=19620601T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19570901T000000
+RRULE:FREQ=YEARLY;UNTIL=19620831T230000Z;BYMONTH=9
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19570901T000000
-RRULE:FREQ=YEARLY;UNTIL=19620831T230000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0053
-TZOFFSETTO:-0053
-TZNAME:FMT
-DTSTART:18820101T000000
-RDATE:18820101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0053
-TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19130601T000000
-RDATE:19130601T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19570101T000000
-RDATE:19570101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Gaborone.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Gaborone.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Gaborone.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Gaborone
 X-LIC-LOCATION:Africa/Gaborone
 BEGIN:STANDARD
+DTSTART:18850101T000000
+RDATE:18850101T000000
+TZNAME:CAT
 TZOFFSETFROM:+014340
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:18850101T000000
-RDATE:18850101T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19430919T020000
+RDATE:19430919T020000
+TZNAME:CAST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:CAST
-DTSTART:19430919T020000
-RDATE:19430919T020000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19440319T020000
+RDATE:19440319T020000
+TZNAME:CAT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19440319T020000
-RDATE:19440319T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Harare.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Harare.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Harare.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Harare
 X-LIC-LOCATION:Africa/Harare
 BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:CAT
 TZOFFSETFROM:+020412
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19030301T000000
-RDATE:19030301T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Johannesburg.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Johannesburg.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Johannesburg.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Johannesburg
 X-LIC-LOCATION:Africa/Johannesburg
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:SAST
-DTSTART:19420920T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19430919T000000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
+DTSTART:18920208T000000
+RDATE:18920208T000000
 TZNAME:SAST
-DTSTART:19430321T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19440318T230000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0152
 TZOFFSETTO:+0130
-TZNAME:SAST
-DTSTART:18920208T000000
-RDATE:18920208T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:SAST
 TZOFFSETFROM:+0130
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420920T020000
+RRULE:FREQ=YEARLY;UNTIL=19430919T000000Z;BYDAY=3SU;BYMONTH=9
 TZNAME:SAST
-DTSTART:19030301T000000
-RDATE:19030301T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19430321T020000
+RRULE:FREQ=YEARLY;UNTIL=19440318T230000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:SAST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kampala.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kampala.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kampala.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Kampala
 X-LIC-LOCATION:Africa/Kampala
 BEGIN:STANDARD
+DTSTART:19280701T000000
+RDATE:19280701T000000
+TZNAME:EAT
 TZOFFSETFROM:+020940
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19280701T000000
-RDATE:19280701T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19300101T000000
+RDATE:19300101T000000
+TZNAME:BEAT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0230
-TZNAME:BEAT
-DTSTART:19300101T000000
-RDATE:19300101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19480101T000000
+RDATE:19480101T000000
+TZNAME:BEAUT
 TZOFFSETFROM:+0230
 TZOFFSETTO:+024445
-TZNAME:BEAUT
-DTSTART:19480101T000000
-RDATE:19480101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19570101T000000
+RDATE:19570101T000000
+TZNAME:EAT
 TZOFFSETFROM:+024445
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19570101T000000
-RDATE:19570101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Khartoum.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Khartoum.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Khartoum.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,44 +1,45 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Khartoum
 X-LIC-LOCATION:Africa/Khartoum
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:CAST
+TZOFFSETFROM:+021008
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19701015T000000
-RRULE:FREQ=YEARLY;UNTIL=19851014T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19700501T000000
+RDATE:19700501T000000
+RDATE:19710430T000000
+TZNAME:CAST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:CAST
-DTSTART:19720430T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19850427T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+021008
+DTSTART:19701015T000000
+RRULE:FREQ=YEARLY;UNTIL=19851014T210000Z;BYMONTH=10
+TZNAME:CAT
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19310101T000000
-RDATE:19310101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720430T000000
+RRULE:FREQ=YEARLY;UNTIL=19850427T220000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CAST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:CAST
-DTSTART:19700501T000000
-RDATE:19700501T000000
-RDATE:19710430T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20000115T120000
+RDATE:20000115T120000
+TZNAME:EAT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:20000115T120000
-RDATE:20000115T120000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kigali.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kigali.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kigali.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Kigali
 X-LIC-LOCATION:Africa/Kigali
 BEGIN:STANDARD
+DTSTART:19350601T000000
+RDATE:19350601T000000
+TZNAME:CAT
 TZOFFSETFROM:+020016
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19350601T000000
-RDATE:19350601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kinshasa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kinshasa.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kinshasa.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Kinshasa
 X-LIC-LOCATION:Africa/Kinshasa
 BEGIN:STANDARD
+DTSTART:18971109T000000
+RDATE:18971109T000000
+TZNAME:WAT
 TZOFFSETFROM:+010112
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:18971109T000000
-RDATE:18971109T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lagos.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lagos.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lagos.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Lagos
 X-LIC-LOCATION:Africa/Lagos
 BEGIN:STANDARD
+DTSTART:19190901T000000
+RDATE:19190901T000000
+TZNAME:WAT
 TZOFFSETFROM:+001336
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19190901T000000
-RDATE:19190901T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Libreville.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Libreville.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Libreville.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Libreville
 X-LIC-LOCATION:Africa/Libreville
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
 TZOFFSETFROM:+003748
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lome.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lome.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lome.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Lome
 X-LIC-LOCATION:Africa/Lome
 BEGIN:STANDARD
+DTSTART:18930101T000000
+RDATE:18930101T000000
+TZNAME:GMT
 TZOFFSETFROM:+000452
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18930101T000000
-RDATE:18930101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Luanda.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Luanda.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Luanda.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Luanda
 X-LIC-LOCATION:Africa/Luanda
 BEGIN:STANDARD
+DTSTART:18920101T000000
+RDATE:18920101T000000
+TZNAME:AOT
 TZOFFSETFROM:+005256
 TZOFFSETTO:+005204
-TZNAME:AOT
-DTSTART:18920101T000000
-RDATE:18920101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110526T000000
+RDATE:19110526T000000
+TZNAME:WAT
 TZOFFSETFROM:+005204
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19110526T000000
-RDATE:19110526T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lubumbashi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lubumbashi.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lubumbashi.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Lubumbashi
 X-LIC-LOCATION:Africa/Lubumbashi
 BEGIN:STANDARD
+DTSTART:18971109T000000
+RDATE:18971109T000000
+TZNAME:CAT
 TZOFFSETFROM:+014952
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:18971109T000000
-RDATE:18971109T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lusaka.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lusaka.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lusaka.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Lusaka
 X-LIC-LOCATION:Africa/Lusaka
 BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:CAT
 TZOFFSETFROM:+015308
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19030301T000000
-RDATE:19030301T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Malabo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Malabo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Malabo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Malabo
 X-LIC-LOCATION:Africa/Malabo
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
 TZOFFSETFROM:+003508
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19631215T000000
+RDATE:19631215T000000
+TZNAME:WAT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19631215T000000
-RDATE:19631215T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maputo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maputo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maputo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Maputo
 X-LIC-LOCATION:Africa/Maputo
 BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:CAT
 TZOFFSETFROM:+021020
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19030301T000000
-RDATE:19030301T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maseru.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maseru.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maseru.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Maseru
 X-LIC-LOCATION:Africa/Maseru
 BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:SAST
 TZOFFSETFROM:+0150
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19430919T020000
+RDATE:19430919T020000
 TZNAME:SAST
-DTSTART:19030301T000000
-RDATE:19030301T000000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19440319T020000
+RDATE:19440319T020000
 TZNAME:SAST
-DTSTART:19430919T020000
-RDATE:19430919T020000
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:SAST
-DTSTART:19440319T020000
-RDATE:19440319T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mbabane.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mbabane.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mbabane.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Mbabane
 X-LIC-LOCATION:Africa/Mbabane
 BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:SAST
 TZOFFSETFROM:+020424
 TZOFFSETTO:+0200
-TZNAME:SAST
-DTSTART:19030301T000000
-RDATE:19030301T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mogadishu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mogadishu.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mogadishu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Mogadishu
 X-LIC-LOCATION:Africa/Mogadishu
 BEGIN:STANDARD
+DTSTART:18931101T000000
+RDATE:18931101T000000
+TZNAME:EAT
 TZOFFSETFROM:+030128
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:18931101T000000
-RDATE:18931101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:BEAT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0230
-TZNAME:BEAT
-DTSTART:19310101T000000
-RDATE:19310101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19570101T000000
+RDATE:19570101T000000
+TZNAME:EAT
 TZOFFSETFROM:+0230
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19570101T000000
-RDATE:19570101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Monrovia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Monrovia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Monrovia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Monrovia
 X-LIC-LOCATION:Africa/Monrovia
 BEGIN:STANDARD
+DTSTART:18820101T000000
+RDATE:18820101T000000
+TZNAME:MMT
 TZOFFSETFROM:-004308
 TZOFFSETTO:-004308
-TZNAME:MMT
-DTSTART:18820101T000000
-RDATE:18820101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19190301T000000
+RDATE:19190301T000000
+TZNAME:LRT
 TZOFFSETFROM:-004308
 TZOFFSETTO:-004430
-TZNAME:LRT
-DTSTART:19190301T000000
-RDATE:19190301T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19720501T000000
+RDATE:19720501T000000
+TZNAME:GMT
 TZOFFSETFROM:-004430
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19720501T000000
-RDATE:19720501T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nairobi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nairobi.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nairobi.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Nairobi
 X-LIC-LOCATION:Africa/Nairobi
 BEGIN:STANDARD
+DTSTART:19280701T000000
+RDATE:19280701T000000
+TZNAME:EAT
 TZOFFSETFROM:+022716
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19280701T000000
-RDATE:19280701T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19300101T000000
+RDATE:19300101T000000
+TZNAME:BEAT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0230
-TZNAME:BEAT
-DTSTART:19300101T000000
-RDATE:19300101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19400101T000000
+RDATE:19400101T000000
+TZNAME:BEAUT
 TZOFFSETFROM:+0230
 TZOFFSETTO:+024445
-TZNAME:BEAUT
-DTSTART:19400101T000000
-RDATE:19400101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19600101T000000
+RDATE:19600101T000000
+TZNAME:EAT
 TZOFFSETFROM:+024445
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19600101T000000
-RDATE:19600101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ndjamena.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ndjamena.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ndjamena.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Ndjamena
 X-LIC-LOCATION:Africa/Ndjamena
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
 TZOFFSETFROM:+010012
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19791014T000000
+RDATE:19791014T000000
+TZNAME:WAST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:WAST
-DTSTART:19791014T000000
-RDATE:19791014T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19800308T000000
+RDATE:19800308T000000
+TZNAME:WAT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19800308T000000
-RDATE:19800308T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Niamey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Niamey.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Niamey.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Niamey
 X-LIC-LOCATION:Africa/Niamey
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
 TZOFFSETFROM:+000828
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:GMT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19340226T000000
-RDATE:19340226T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19600101T000000
+RDATE:19600101T000000
+TZNAME:WAT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19600101T000000
-RDATE:19600101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nouakchott.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nouakchott.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nouakchott.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Nouakchott
 X-LIC-LOCATION:Africa/Nouakchott
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
 TZOFFSETFROM:-010348
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19340226T000000
-RDATE:19340226T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19601128T000000
+RDATE:19601128T000000
+TZNAME:GMT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19601128T000000
-RDATE:19601128T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ouagadougou.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ouagadougou.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ouagadougou.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Ouagadougou
 X-LIC-LOCATION:Africa/Ouagadougou
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
 TZOFFSETFROM:-000604
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Porto-Novo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Porto-Novo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Porto-Novo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Porto-Novo
 X-LIC-LOCATION:Africa/Porto-Novo
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
 TZOFFSETFROM:+001028
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19340226T000000
-RDATE:19340226T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Sao_Tome.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Sao_Tome.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Sao_Tome.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Sao_Tome
 X-LIC-LOCATION:Africa/Sao_Tome
 BEGIN:STANDARD
-TZOFFSETFROM:+002656
-TZOFFSETTO:-003632
-TZNAME:LMT
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-003632
-TZOFFSETTO:+0000
-TZNAME:GMT
 DTSTART:19120101T000000
 RDATE:19120101T000000
+TZNAME:GMT
+TZOFFSETFROM:-003632
+TZOFFSETTO:+0000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Timbuktu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Timbuktu.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Timbuktu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Timbuktu
 X-LIC-LOCATION:Africa/Timbuktu
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
 TZOFFSETFROM:-0032
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19340226T000000
-RDATE:19340226T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19600620T000000
+RDATE:19600620T000000
+TZNAME:GMT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19600620T000000
-RDATE:19600620T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tripoli.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tripoli.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tripoli.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,82 +1,95 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Tripoli
 X-LIC-LOCATION:Africa/Tripoli
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:CEST
+TZOFFSETFROM:+005244
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19511014T020000
+RDATE:19511014T020000
+RDATE:19531009T020000
+RDATE:19550930T000000
+RDATE:19850406T000000
+RDATE:19860404T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19820401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19520101T000000
+RDATE:19520101T000000
+RDATE:19540101T000000
+RDATE:19560101T000000
+RDATE:19861003T000000
+RDATE:19960930T000000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19590101T000000
+RDATE:19590101T000000
+RDATE:19900504T000000
+TZNAME:EET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
 TZNAME:CEST
-DTSTART:19870401T000000
-RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19871001T000000
-RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19820401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+005244
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870401T000000
+RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19511014T020000
-RDATE:19511014T020000
-RDATE:19531009T020000
-RDATE:19550930T000000
-RDATE:19850406T000000
-RDATE:19860404T000000
-RDATE:19970404T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19871001T000000
+RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19520101T000000
-RDATE:19520101T000000
-RDATE:19540101T000000
-RDATE:19560101T000000
-RDATE:19820101T000000
-RDATE:19861003T000000
-RDATE:19960930T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19970404T000000
+RDATE:19970404T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19590101T000000
-RDATE:19590101T000000
-RDATE:19900504T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19971004T000000
+RDATE:19971004T000000
+TZNAME:EET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19971004T000000
-RDATE:19971004T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tunis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tunis.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tunis.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,55 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Tunis
 X-LIC-LOCATION:Africa/Tunis
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19880925T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:20060326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:20061029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18810512T000000
+RDATE:18810512T000000
+TZNAME:PMT
 TZOFFSETFROM:+004044
 TZOFFSETTO:+000921
-TZNAME:PMT
-DTSTART:18810512T000000
-RDATE:18810512T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110311T000000
+RDATE:19110311T000000
+TZNAME:CEST
 TZOFFSETFROM:+000921
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19110311T000000
-RDATE:19110311T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19390415T230000
 RDATE:19390415T230000
 RDATE:19400225T230000
@@ -62,11 +32,11 @@
 RDATE:19890326T000000
 RDATE:19900501T000000
 RDATE:20050501T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19391119T000000
 RDATE:19391119T000000
 RDATE:19411006T000000
@@ -78,6 +48,37 @@
 RDATE:19770924T010000
 RDATE:19781001T010000
 RDATE:20050930T020000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;UNTIL=19450402T010000Z;BYDAY=1MO;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19880925T010000
+RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20060326T020000
+RRULE:FREQ=YEARLY;UNTIL=20080330T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20061029T030000
+RRULE:FREQ=YEARLY;UNTIL=20081026T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Windhoek.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Windhoek.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Windhoek.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,65 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Africa/Windhoek
 X-LIC-LOCATION:Africa/Windhoek
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:WAST
-DTSTART:19940904T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:WAT
-DTSTART:19950402T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18920208T000000
+RDATE:18920208T000000
+TZNAME:SWAT
 TZOFFSETFROM:+010824
 TZOFFSETTO:+0130
-TZNAME:SWAT
-DTSTART:18920208T000000
-RDATE:18920208T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:SAST
 TZOFFSETFROM:+0130
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420920T020000
+RDATE:19420920T020000
 TZNAME:SAST
-DTSTART:19030301T000000
-RDATE:19030301T000000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19430321T020000
+RDATE:19430321T020000
 TZNAME:SAST
-DTSTART:19420920T020000
-RDATE:19420920T020000
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:SAST
-DTSTART:19430321T020000
-RDATE:19430321T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19900321T000000
+RDATE:19900321T000000
+TZNAME:CAT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-TZNAME:CAT
-DTSTART:19900321T000000
-RDATE:19900321T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19940403T000000
+RDATE:19940403T000000
+TZNAME:WAST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19940904T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=9
+TZNAME:WAST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19950402T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
 TZNAME:WAT
-DTSTART:19940403T000000
-RDATE:19940403T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Adak.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Adak.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Adak.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,137 +1,131 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Adak
 X-LIC-LOCATION:America/Adak
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:BDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T130000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-TZNAME:BST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T120000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:BDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T130000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:HADT
-DTSTART:19840429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T120000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-TZNAME:HAST
-DTSTART:19841028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T110000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:HADT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T120000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:HADT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-TZNAME:HAST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+121321
-TZOFFSETTO:-114638
-TZNAME:LMT
-DTSTART:18671018T000000
-RDATE:18671018T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-114638
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19000820T120000
 RDATE:19000820T120000
+TZNAME:NST
+TZOFFSETFROM:-114638
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19420101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
+TZNAME:NST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:NWT
 DTSTART:19420209T020000
 RDATE:19420209T020000
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-TZNAME:NPT
 DTSTART:19450814T130000
 RDATE:19450814T130000
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19450930T020000
 RDATE:19450930T020000
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:BST
 DTSTART:19670401T000000
 RDATE:19670401T000000
 RDATE:19690101T000000
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T130000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:BDT
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1000
-TZNAME:BDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19821031T120000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:BST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19740106T020000
 RDATE:19740106T020000
 RDATE:19750223T020000
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-1000
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T130000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:BDT
+TZOFFSETFROM:-1100
 TZOFFSETTO:-1000
-TZNAME:AHST
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19831030T020000
 RDATE:19831030T020000
+TZNAME:AHST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19831130T000000
+RDATE:19831130T000000
+TZNAME:HAST
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T120000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:HADT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T110000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:HAST
-DTSTART:19831130T000000
-RDATE:19831130T000000
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T120000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:HADT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:HADT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:HAST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anchorage.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anchorage.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anchorage.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,137 +1,137 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Anchorage
 X-LIC-LOCATION:America/Anchorage
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:AHDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T120000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-TZNAME:AHST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T110000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:AHDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T120000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19840429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:19841028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+140024
-TZOFFSETTO:-095936
-TZNAME:LMT
-DTSTART:18671018T000000
-RDATE:18671018T000000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:CAT
 TZOFFSETFROM:-095936
 TZOFFSETTO:-1000
-TZNAME:CAT
-DTSTART:19000820T120000
-RDATE:19000820T120000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+TZNAME:CAT/CAWT
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
-TZNAME:CAT
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CAT/CAWT
 TZOFFSETFROM:-1000
 TZOFFSETTO:-0900
-TZNAME:CAWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T140000
+RDATE:19450814T140000
+TZNAME:CAT/CAPT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
-TZNAME:CAPT
-DTSTART:19450814T140000
-RDATE:19450814T140000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:CAT/CAPT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-1000
-TZNAME:CAT
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:CAT
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
-TZNAME:AHST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19670401T000000
 RDATE:19670401T000000
 RDATE:19690101T000000
+TZNAME:AHST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T120000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:AHDT
 TZOFFSETFROM:-1000
 TZOFFSETTO:-0900
-TZNAME:AHDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19821031T110000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AHST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19740106T020000
 RDATE:19740106T020000
 RDATE:19750223T020000
+TZNAME:AHDT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T120000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:AHDT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19831030T020000
+RDATE:19831030T020000
+TZNAME:YST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19831030T020000
-RDATE:19831030T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19831130T000000
+RDATE:19831130T000000
+TZNAME:AKST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T110000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T100000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:AKST
-DTSTART:19831130T000000
-RDATE:19831130T000000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T110000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AKST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anguilla.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anguilla.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anguilla.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Anguilla
 X-LIC-LOCATION:America/Anguilla
 BEGIN:STANDARD
+DTSTART:19120302T000000
+RDATE:19120302T000000
+TZNAME:AST
 TZOFFSETFROM:-041216
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19120302T000000
-RDATE:19120302T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Antigua.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Antigua.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Antigua.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Antigua
 X-LIC-LOCATION:America/Antigua
 BEGIN:STANDARD
+DTSTART:19120302T000000
+RDATE:19120302T000000
+TZNAME:EST
 TZOFFSETFROM:-040712
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19120302T000000
-RDATE:19120302T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:AST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19510101T000000
-RDATE:19510101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Araguaina.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Araguaina.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Araguaina.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,83 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Araguaina
 X-LIC-LOCATION:America/Araguaina
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19140101T000000
+RDATE:19140101T000000
 TZNAME:BRST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19961006T000000
-RRULE:FREQ=YEARLY;UNTIL=19971006T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20010218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20030216T020000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-031248
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19140101T000000
-RDATE:19140101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
 DTSTART:19311003T110000
 RDATE:19311003T110000
 RDATE:19321003T000000
@@ -85,17 +20,35 @@
 RDATE:19650131T000000
 RDATE:19651201T000000
 RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
 RDATE:19881016T000000
 RDATE:19891015T000000
 RDATE:19951015T000000
+RDATE:19961006T000000
+RDATE:19971006T000000
 RDATE:19981011T000000
 RDATE:19991003T000000
 RDATE:20021103T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z;BYMONTH=12
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -111,15 +64,59 @@
 RDATE:19980301T000000
 RDATE:19990221T000000
 RDATE:20000227T000000
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z;BYMONTH=4
+TZNAME:BRT
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z;BYMONTH=3
 TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z;BYMONTH=11
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900917T000000
 RDATE:19900917T000000
-RDATE:19950914T000000
 RDATE:20030924T000000
+TZNAME:BRT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19950914T000000
+RDATE:19950914T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;UNTIL=20011014T030000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;UNTIL=20030216T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Buenos_Aires.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Buenos_Aires.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Buenos_Aires.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,154 +1,143 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Buenos_Aires
 X-LIC-LOCATION:America/Argentina/Buenos_Aires
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-035348
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19200501T000000
+RDATE:19200501T000000
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:20080316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-035348
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:20071230T000000
+RDATE:20081019T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19740501T000000
+RDATE:19740501T000000
+TZNAME:ART
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
 TZNAME:ART
-DTSTART:19740501T000000
-RDATE:19740501T000000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19991003T000000
-RDATE:19991003T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+RDATE:20000303T000000
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080316T000000
+RRULE:FREQ=YEARLY;UNTIL=20090315T020000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:ART
-DTSTART:20000303T000000
-RDATE:20000303T000000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Catamarca.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Catamarca.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Catamarca.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,172 +1,173 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Catamarca
 X-LIC-LOCATION:America/Argentina/Catamarca
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042308
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-042308
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910303T000000
 RDATE:19910303T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911020T000000
+RDATE:19911020T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:19911020T000000
-RDATE:19911020T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:ARST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
 RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20040601T000000
+RDATE:20040601T000000
+TZNAME:WART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:20040601T000000
-RDATE:20040601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/ComodRivadavia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/ComodRivadavia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/ComodRivadavia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,172 +1,173 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/ComodRivadavia
 X-LIC-LOCATION:America/Argentina/ComodRivadavia
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042308
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-042308
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910303T000000
 RDATE:19910303T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911020T000000
+RDATE:19911020T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:19911020T000000
-RDATE:19911020T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:ARST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
 RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20040601T000000
+RDATE:20040601T000000
+TZNAME:WART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:20040601T000000
-RDATE:20040601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Cordoba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Cordoba.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Cordoba.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,176 +1,165 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Cordoba
 X-LIC-LOCATION:America/Argentina/Cordoba
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-041648
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19200501T000000
+RDATE:19200501T000000
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:20080316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+RDATE:20081019T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19910303T000000
-RDATE:19910303T000000
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
 TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910303T000000
+RDATE:19910303T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19911020T000000
 RDATE:19911020T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
 TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+RDATE:20000303T000000
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080316T000000
+RRULE:FREQ=YEARLY;UNTIL=20090315T020000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:ART
-DTSTART:20000303T000000
-RDATE:20000303T000000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Jujuy.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Jujuy.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Jujuy.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,173 +1,174 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Jujuy
 X-LIC-LOCATION:America/Argentina/Jujuy
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042112
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
+BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-042112
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
-END:STANDARD
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19691005T000000
-RDATE:19691005T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19891015T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:19890305T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19900304T000000
+RDATE:19900304T000000
+TZNAME:WART
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19900304T000000
-RDATE:19900304T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19901028T000000
+RDATE:19901028T000000
+TZNAME:WARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:WARST
-DTSTART:19901028T000000
-RDATE:19901028T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910317T000000
+RDATE:19910317T000000
+TZNAME:WART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19910317T000000
-RDATE:19910317T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911006T000000
+RDATE:19911006T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
 TZNAME:ARST
-DTSTART:19911006T000000
-RDATE:19911006T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+RDATE:20000303T000000
 TZNAME:ARST
-DTSTART:19920101T000000
-RDATE:19920101T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19991003T000000
-RDATE:19991003T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:20081018T000000
+RDATE:20081018T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:20000303T000000
-RDATE:20000303T000000
-RDATE:20081018T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/La_Rioja.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/La_Rioja.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/La_Rioja.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,165 +1,173 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/La_Rioja
 X-LIC-LOCATION:America/Argentina/La_Rioja
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042724
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-042724
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:19910507T000000
 RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910301T000000
 RDATE:19910301T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19911020T000000
+RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:ARST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
 RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20040601T000000
+RDATE:20040601T000000
+TZNAME:WART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:20040601T000000
-RDATE:20040601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Mendoza.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Mendoza.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Mendoza.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,167 +1,164 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Mendoza
 X-LIC-LOCATION:America/Argentina/Mendoza
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043516
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
 TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:WARST
-DTSTART:19901015T000000
-RRULE:FREQ=YEARLY;UNTIL=19911015T040000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19910301T000000
-RRULE:FREQ=YEARLY;UNTIL=19920301T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-043516
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:20040926T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19891015T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:19890305T000000
 RDATE:19930307T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
 DTSTART:19900304T000000
 RDATE:19900304T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19901015T000000
+RDATE:19901015T000000
+RDATE:19911015T000000
+TZNAME:WARST
 TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-TZNAME:ARST
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910301T000000
+RDATE:19910301T000000
+RDATE:19920301T000000
+RDATE:20040523T000000
+TZNAME:WART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19921018T000000
 RDATE:19921018T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
 TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
 RDATE:20081018T000000
-END:STANDARD
-BEGIN:STANDARD
+TZNAME:ART
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:20040523T000000
-RDATE:20040523T000000
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Rio_Gallegos.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Rio_Gallegos.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Rio_Gallegos.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,150 +1,151 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Rio_Gallegos
 X-LIC-LOCATION:America/Argentina/Rio_Gallegos
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043652
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-043652
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-TZNAME:ARST
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
 RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20040601T000000
+RDATE:20040601T000000
+TZNAME:WART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:20040601T000000
-RDATE:20040601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Salta.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Salta.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Salta.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,164 +1,165 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Salta
 X-LIC-LOCATION:America/Argentina/Salta
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042140
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-042140
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19691005T000000
-RDATE:19691005T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910303T000000
 RDATE:19910303T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911020T000000
+RDATE:19911020T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+RDATE:20000303T000000
 TZNAME:ARST
-DTSTART:19911020T000000
-RDATE:19911020T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19991003T000000
-RDATE:19991003T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:20081018T000000
+RDATE:20081018T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:20000303T000000
-RDATE:20000303T000000
-RDATE:20081018T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Juan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Juan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Juan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,165 +1,173 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/San_Juan
 X-LIC-LOCATION:America/Argentina/San_Juan
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043404
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-043404
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:19910507T000000
 RDATE:20040725T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910301T000000
 RDATE:19910301T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19911020T000000
+RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:ARST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
 RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20040531T000000
+RDATE:20040531T000000
+TZNAME:WART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:20040531T000000
-RDATE:20040531T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Luis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Luis.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Luis.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,165 +1,187 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/San_Luis
 X-LIC-LOCATION:America/Argentina/San_Luis
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042524
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-042524
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040725T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:19910601T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19891015T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:19890305T000000
-RDATE:20080121T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900101T000000
+RDATE:19900101T000000
+TZNAME:ARST
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:19900101T000000
-RDATE:19900101T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19900314T000000
+RDATE:19900314T000000
+TZNAME:WART
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19900314T000000
-RDATE:19900314T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19901015T000000
+RDATE:19901015T000000
+TZNAME:WARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:WARST
-DTSTART:19901015T000000
-RDATE:19901015T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:WART
 DTSTART:19910301T000000
 RDATE:19910301T000000
 RDATE:20040531T000000
+TZNAME:WART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+BEGIN:STANDARD
+DTSTART:19910601T000000
+RDATE:19910601T000000
+TZNAME:ART
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:WARST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:WARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20080121T000000
+RDATE:20080121T000000
+TZNAME:WARST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080309T000000
+RRULE:FREQ=YEARLY;UNTIL=20090308T030000Z;BYDAY=2SU;BYMONTH=3
+TZNAME:WART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081012T000000
+RRULE:FREQ=YEARLY;UNTIL=20091011T040000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:WARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-DTSTART:20040725T000000
-RDATE:20040725T000000
-END:STANDARD
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Tucuman.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Tucuman.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Tucuman.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,184 +1,179 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Tucuman
 X-LIC-LOCATION:America/Argentina/Tucuman
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042052
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19200501T000000
+RDATE:19200501T000000
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:20080316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-042052
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:20040613T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+RDATE:20081019T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19910303T000000
-RDATE:19910303T000000
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
 TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910303T000000
+RDATE:19910303T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19911020T000000
 RDATE:19911020T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
 TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:WART
 DTSTART:20040601T000000
 RDATE:20040601T000000
+TZNAME:WART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080316T000000
+RRULE:FREQ=YEARLY;UNTIL=20090315T020000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Ushuaia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Ushuaia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Ushuaia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,150 +1,151 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Argentina/Ushuaia
 X-LIC-LOCATION:America/Argentina/Ushuaia
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043312
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-043312
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-TZNAME:ARST
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
 RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20040530T000000
+RDATE:20040530T000000
+TZNAME:WART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:20040530T000000
-RDATE:20040530T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Aruba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Aruba.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Aruba.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Aruba
 X-LIC-LOCATION:America/Aruba
 BEGIN:STANDARD
+DTSTART:19120212T000000
+RDATE:19120212T000000
+TZNAME:ANT
 TZOFFSETFROM:-044024
 TZOFFSETTO:-0430
-TZNAME:ANT
-DTSTART:19120212T000000
-RDATE:19120212T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19650101T000000
+RDATE:19650101T000000
+TZNAME:AST
 TZOFFSETFROM:-0430
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19650101T000000
-RDATE:19650101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Asuncion.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Asuncion.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Asuncion.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,134 +1,155 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Asuncion
 X-LIC-LOCATION:America/Asuncion
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:AMT
+TZOFFSETFROM:-035040
+TZOFFSETTO:-035040
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19311010T000000
+RDATE:19311010T000000
+TZNAME:PYT
+TZOFFSETFROM:-035040
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19721001T000000
+RDATE:19721001T000000
+TZNAME:PYT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740401T000000
+RDATE:19740401T000000
 TZNAME:PYST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19750301T000000
+RDATE:19750301T000000
+TZNAME:PYT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19751001T000000
-RRULE:FREQ=YEARLY;UNTIL=19881001T040000Z
+RRULE:FREQ=YEARLY;UNTIL=19881001T040000Z;BYMONTH=10
+TZNAME:PYST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19760301T000000
+RRULE:FREQ=YEARLY;UNTIL=19780301T030000Z;BYMONTH=3
+TZNAME:PYT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790401T000000
+RRULE:FREQ=YEARLY;UNTIL=19910401T030000Z;BYMONTH=4
 TZNAME:PYT
-DTSTART:19760301T000000
-RRULE:FREQ=YEARLY;UNTIL=19780301T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891022T000000
+RDATE:19891022T000000
+RDATE:19901001T000000
+RDATE:19911006T000000
+RDATE:19921005T000000
+TZNAME:PYST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19920301T000000
+RDATE:19920301T000000
+RDATE:19930331T000000
+RDATE:19960301T000000
+RDATE:19970223T000000
+TZNAME:PYT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:PYT
-DTSTART:19790401T000000
-RRULE:FREQ=YEARLY;UNTIL=19910401T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19931001T000000
+RRULE:FREQ=YEARLY;UNTIL=19951001T040000Z;BYMONTH=10
+TZNAME:PYST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:PYST
-DTSTART:19931001T000000
-RRULE:FREQ=YEARLY;UNTIL=19951001T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19940227T000000
+RRULE:FREQ=YEARLY;UNTIL=19950226T030000Z;BYDAY=-1SU;BYMONTH=2
+TZNAME:PYT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:PYT
-DTSTART:19940227T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=-1SU;UNTIL=19950226T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19961006T000000
+RRULE:FREQ=YEARLY;UNTIL=20011007T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:PYST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:PYST
-DTSTART:19961006T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20011007T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19980301T000000
+RRULE:FREQ=YEARLY;UNTIL=20010304T030000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:PYT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:PYT
-DTSTART:19980301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=20010304T030000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20020407T000000
+RRULE:FREQ=YEARLY;UNTIL=20040404T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PYT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:PYT
-DTSTART:20020407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20040404T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20020901T000000
+RRULE:FREQ=YEARLY;UNTIL=20030907T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:PYST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:PYST
-DTSTART:20020901T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=20030907T040000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20041017T000000
+RRULE:FREQ=YEARLY;UNTIL=20091018T040000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:PYST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:PYST
-DTSTART:20041017T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20050313T000000
+RRULE:FREQ=YEARLY;UNTIL=20090308T030000Z;BYDAY=2SU;BYMONTH=3
+TZNAME:PYT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:PYT
-DTSTART:20050313T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-035040
-TZOFFSETTO:-035040
-TZNAME:AMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-035040
-TZOFFSETTO:-0400
+DTSTART:20100411T000000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=4
 TZNAME:PYT
-DTSTART:19311010T000000
-RDATE:19311010T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:PYT
-DTSTART:19721001T000000
-RDATE:19721001T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:PYT
-DTSTART:19740401T000000
-RDATE:19740401T000000
-RDATE:19920301T000000
-RDATE:19930331T000000
-RDATE:19960301T000000
-RDATE:19970223T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:PYT
-DTSTART:19750301T000000
-RDATE:19750301T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20101003T000000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:PYST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:PYST
-DTSTART:19891022T000000
-RDATE:19891022T000000
-RDATE:19901001T000000
-RDATE:19911006T000000
-RDATE:19921005T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atikokan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atikokan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atikokan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Atikokan
 X-LIC-LOCATION:America/Atikokan
 BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CST
 TZOFFSETFROM:-060628
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18950101T000000
-RDATE:18950101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19400929T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181031T020000
-RDATE:19181031T020000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400929T000000
+RDATE:19400929T000000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T030000
+RDATE:19420209T030000
+TZNAME:CWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:EST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atka.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atka.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atka.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,137 +1,131 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Atka
 X-LIC-LOCATION:America/Atka
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:BDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T130000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-TZNAME:BST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T120000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:BDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T130000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:HADT
-DTSTART:19840429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T120000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-TZNAME:HAST
-DTSTART:19841028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T110000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:HADT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T120000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:HADT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-TZNAME:HAST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+121321
-TZOFFSETTO:-114638
-TZNAME:LMT
-DTSTART:18671018T000000
-RDATE:18671018T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-114638
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19000820T120000
 RDATE:19000820T120000
+TZNAME:NST
+TZOFFSETFROM:-114638
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19420101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
+TZNAME:NST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:NWT
 DTSTART:19420209T020000
 RDATE:19420209T020000
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-TZNAME:NPT
 DTSTART:19450814T130000
 RDATE:19450814T130000
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19450930T020000
 RDATE:19450930T020000
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:BST
 DTSTART:19670401T000000
 RDATE:19670401T000000
 RDATE:19690101T000000
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T130000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:BDT
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1000
-TZNAME:BDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19821031T120000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:BST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19740106T020000
 RDATE:19740106T020000
 RDATE:19750223T020000
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-1000
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T130000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:BDT
+TZOFFSETFROM:-1100
 TZOFFSETTO:-1000
-TZNAME:AHST
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19831030T020000
 RDATE:19831030T020000
+TZNAME:AHST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19831130T000000
+RDATE:19831130T000000
+TZNAME:HAST
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T120000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:HADT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T110000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:HAST
-DTSTART:19831130T000000
-RDATE:19831130T000000
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T120000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:HADT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:HADT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:HAST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,97 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Bahia
 X-LIC-LOCATION:America/Bahia
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19140101T000000
+RDATE:19140101T000000
 TZNAME:BRST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19931017T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19951015T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19940220T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=19950219T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19961006T000000
-RRULE:FREQ=YEARLY;UNTIL=19971006T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20010218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20030216T020000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-023404
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19140101T000000
-RDATE:19140101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
 DTSTART:19311003T110000
 RDATE:19311003T110000
 RDATE:19321003T000000
@@ -99,19 +20,37 @@
 RDATE:19650131T000000
 RDATE:19651201T000000
 RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
 RDATE:19881016T000000
 RDATE:19891015T000000
 RDATE:19901021T000000
 RDATE:19911020T000000
 RDATE:19921025T000000
+RDATE:19961006T000000
+RDATE:19971006T000000
 RDATE:19981011T000000
 RDATE:19991003T000000
 RDATE:20021103T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z;BYMONTH=12
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -130,13 +69,65 @@
 RDATE:19980301T000000
 RDATE:19990221T000000
 RDATE:20000227T000000
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z;BYMONTH=4
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z;BYMONTH=3
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z;BYMONTH=11
+TZNAME:BRST
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;UNTIL=19951015T030000Z;BYDAY=-3SU;BYMONTH=10
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;UNTIL=19950219T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;UNTIL=20011014T030000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;UNTIL=20030216T020000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20030924T000000
 RDATE:20030924T000000
+TZNAME:BRT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia_Banderas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia_Banderas.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia_Banderas.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,105 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:America/Bahia_Banderas
+X-LIC-LOCATION:America/Bahia_Banderas
+BEGIN:STANDARD
+DTSTART:19211231T235900
+RDATE:19211231T235900
+TZNAME:MST
+TZOFFSETFROM:-0701
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19270610T230000
+RDATE:19270610T230000
+RDATE:19310501T230000
+RDATE:19320401T000000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19301115T000000
+RDATE:19301115T000000
+RDATE:19311001T000000
+RDATE:19420424T000000
+RDATE:20010930T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19490114T000000
+RDATE:19490114T000000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19700101T000000
+RDATE:19700101T000000
+TZNAME:MST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010506T020000
+RDATE:20010506T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20090405T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;UNTIL=20091025T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100404T020000
+RDATE:20100404T020000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20101031T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20110403T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Barbados.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Barbados.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Barbados.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,52 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Barbados
 X-LIC-LOCATION:America/Barbados
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19240101T000000
+RDATE:19240101T000000
+TZNAME:BMT
+TZOFFSETFROM:-035828
+TZOFFSETTO:-035828
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320101T000000
+RDATE:19320101T000000
+TZNAME:AST
+TZOFFSETFROM:-035828
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19771002T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19781001T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19770612T020000
+RDATE:19770612T020000
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19780416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19800420T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-035828
-TZOFFSETTO:-035828
-TZNAME:BMT
-DTSTART:19240101T000000
-RDATE:19240101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-035828
+DTSTART:19771002T020000
+RRULE:FREQ=YEARLY;UNTIL=19781001T050000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19320101T000000
-RDATE:19320101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19780416T020000
+RRULE:FREQ=YEARLY;UNTIL=19800420T060000Z;BYDAY=3SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19770612T020000
-RDATE:19770612T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AST
 DTSTART:19790930T020000
 RDATE:19790930T020000
 RDATE:19800925T020000
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belem.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belem.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belem.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,74 +1,46 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Belem
 X-LIC-LOCATION:America/Belem
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-031356
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
 TZNAME:BRT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z;BYMONTH=12
 TZNAME:BRST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-031356
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -77,13 +49,37 @@
 RDATE:19860315T000000
 RDATE:19870214T000000
 RDATE:19880207T000000
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z;BYMONTH=4
+TZNAME:BRT
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z;BYMONTH=3
 TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z;BYMONTH=11
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
+TZNAME:BRT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belize.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belize.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belize.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,45 +1,48 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Belize
 X-LIC-LOCATION:America/Belize
+BEGIN:STANDARD
+DTSTART:19120401T000000
+RDATE:19120401T000000
+TZNAME:CST
+TZOFFSETFROM:-055248
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19181006T000000
+RRULE:FREQ=YEARLY;UNTIL=19421004T060000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:CHDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0530
-TZNAME:CHDT
-DTSTART:19181006T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19421004T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19190209T000000
+RRULE:FREQ=YEARLY;UNTIL=19430214T053000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=2
+TZNAME:CST
 TZOFFSETFROM:-0530
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19190209T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430214T053000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-055248
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19120401T000000
-RDATE:19120401T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
 DTSTART:19731205T000000
 RDATE:19731205T000000
 RDATE:19821218T000000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19740209T000000
 RDATE:19740209T000000
 RDATE:19830212T000000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Blanc-Sablon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Blanc-Sablon.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Blanc-Sablon.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,52 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Blanc-Sablon
 X-LIC-LOCATION:America/Blanc-Sablon
 BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:AST
 TZOFFSETFROM:-034828
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19180414T020000
-RDATE:19180414T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AST
 DTSTART:19181031T020000
 RDATE:19181031T020000
 RDATE:19450930T020000
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:APT
-DTSTART:19450814T200000
-RDATE:19450814T200000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19700101T000000
+RDATE:19700101T000000
+TZNAME:AST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19700101T000000
-RDATE:19700101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boa_Vista.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boa_Vista.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boa_Vista.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,62 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Boa_Vista
 X-LIC-LOCATION:America/Boa_Vista
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19140101T000000
+RDATE:19140101T000000
 TZNAME:AMST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:-040240
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19140101T000000
-RDATE:19140101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:AMST
 DTSTART:19311003T110000
 RDATE:19311003T110000
 RDATE:19321003T000000
@@ -64,13 +20,29 @@
 RDATE:19650131T000000
 RDATE:19651201T000000
 RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
 RDATE:19991003T000000
 RDATE:20001008T000000
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
+TZNAME:AMT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z;BYMONTH=12
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -81,14 +53,44 @@
 RDATE:19880207T000000
 RDATE:20000227T000000
 RDATE:20001015T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z;BYMONTH=3
 TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z;BYMONTH=11
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
+TZNAME:AMT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990930T000000
 RDATE:19990930T000000
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bogota.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bogota.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bogota.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Bogota
 X-LIC-LOCATION:America/Bogota
 BEGIN:STANDARD
+DTSTART:18840313T000000
+RDATE:18840313T000000
+TZNAME:BMT
 TZOFFSETFROM:-045620
 TZOFFSETTO:-045620
-TZNAME:BMT
-DTSTART:18840313T000000
-RDATE:18840313T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19141123T000000
+RDATE:19141123T000000
+TZNAME:COST
 TZOFFSETFROM:-045620
 TZOFFSETTO:-0500
-TZNAME:COT
-DTSTART:19141123T000000
-RDATE:19141123T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920503T000000
+RDATE:19920503T000000
+TZNAME:COST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:COST
-DTSTART:19920503T000000
-RDATE:19920503T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930404T000000
+RDATE:19930404T000000
+TZNAME:COT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:COT
-DTSTART:19930404T000000
-RDATE:19930404T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boise.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boise.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boise.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,114 +1,128 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Boise
 X-LIC-LOCATION:America/Boise
+BEGIN:STANDARD
+DTSTART:18831118T121511
+RDATE:18831118T121511
+TZNAME:PST
+TZOFFSETFROM:-074449
+TZOFFSETTO:-0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T100000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T090000Z
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19670430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+DTSTART:19230513T020000
+RDATE:19230513T020000
+TZNAME:MST
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740101T000000
+RDATE:19740101T000000
 TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-074449
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:18831118T121511
-RDATE:18831118T121511
+DTSTART:19740203T020000
+RDATE:19740203T020000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19230513T020000
-RDATE:19230513T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19750223T020000
+RDATE:19750223T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19740101T000000
-RDATE:19740101T000000
-END:STANDARD
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19740203T020000
-RDATE:19740203T020000
-RDATE:19750223T020000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Buenos_Aires.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Buenos_Aires.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Buenos_Aires.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,154 +1,143 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Buenos_Aires
 X-LIC-LOCATION:America/Buenos_Aires
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-035348
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19200501T000000
+RDATE:19200501T000000
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19921018T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:20080316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-035348
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:20071230T000000
+RDATE:20081019T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19740501T000000
+RDATE:19740501T000000
+TZNAME:ART
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
 TZNAME:ART
-DTSTART:19740501T000000
-RDATE:19740501T000000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19991003T000000
-RDATE:19991003T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+RDATE:20000303T000000
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080316T000000
+RRULE:FREQ=YEARLY;UNTIL=20090315T020000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:ART
-DTSTART:20000303T000000
-RDATE:20000303T000000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cambridge_Bay.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cambridge_Bay.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cambridge_Bay.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,134 +1,135 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Cambridge_Bay
 X-LIC-LOCATION:America/Cambridge_Bay
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:MST
+TZOFFSETFROM:+0000
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19981025T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19990404T090000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:MDDT
 TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+TZOFFSETTO:-0500
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
+DTSTART:19651031T020000
+RDATE:19651031T020000
 TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19981025T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19990404T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
-TZOFFSETTO:-0500
-TZNAME:MDDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
+TZOFFSETTO:-0600
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19651031T020000
-RDATE:19651031T020000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19991031T020000
+RDATE:19991031T020000
+TZNAME:CST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19991031T020000
-RDATE:19991031T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20000402T020000
+RDATE:20000402T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20000402T020000
-RDATE:20000402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20001029T020000
+RDATE:20001029T020000
+TZNAME:EST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20001029T020000
-RDATE:20001029T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20001105T000000
+RDATE:20001105T000000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20001105T000000
-RDATE:20001105T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010401T030000
+RDATE:20010401T030000
+TZNAME:MDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:MDT
-DTSTART:20010401T020000
-RDATE:20010401T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Campo_Grande.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Campo_Grande.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Campo_Grande.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,202 +1,162 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Campo_Grande
 X-LIC-LOCATION:America/Campo_Grande
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-033828
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19901021T000000
+RDATE:19911020T000000
+RDATE:19921025T000000
+RDATE:19961006T000000
+RDATE:19971006T000000
+RDATE:19981011T000000
+RDATE:19991003T000000
+RDATE:20021103T000000
+RDATE:20031019T000000
+RDATE:20041102T000000
+RDATE:20051016T000000
+RDATE:20061105T000000
+RDATE:20071014T000000
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
 TZNAME:AMT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z;BYMONTH=12
 TZNAME:AMST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19931017T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19951015T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19500416T010000
+RDATE:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19910217T000000
+RDATE:19920209T000000
+RDATE:19930131T000000
+RDATE:19960211T000000
+RDATE:19970216T000000
+RDATE:19980301T000000
+RDATE:19990221T000000
+RDATE:20000227T000000
+RDATE:20070225T000000
+RDATE:20120226T000000
+RDATE:20150222T000000
+TZNAME:AMT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z;BYMONTH=4
 TZNAME:AMT
-DTSTART:19940220T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=19950219T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z;BYMONTH=3
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z;BYMONTH=11
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19961006T000000
-RRULE:FREQ=YEARLY;UNTIL=19971006T040000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;UNTIL=19951015T040000Z;BYDAY=-3SU;BYMONTH=10
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;UNTIL=19950219T030000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:AMT
-DTSTART:20010218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20060219T030000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:20080217T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20110220T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;UNTIL=20011014T040000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;UNTIL=20060219T030000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:AMT
-DTSTART:20130217T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20140216T040000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:20160221T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20220220T040000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;UNTIL=20110220T030000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:AMT
-DTSTART:20240218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20250216T040000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:20270221T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20330220T040000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:20350218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20360217T040000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-033828
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-RDATE:19881016T000000
-RDATE:19891015T000000
-RDATE:19901021T000000
-RDATE:19911020T000000
-RDATE:19921025T000000
-RDATE:19981011T000000
-RDATE:19991003T000000
-RDATE:20021103T000000
-RDATE:20031019T000000
-RDATE:20041102T000000
-RDATE:20051016T000000
-RDATE:20061105T000000
-RDATE:20071014T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;UNTIL=20140216T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19500416T010000
-RDATE:19500416T010000
-RDATE:19530301T000000
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:19890129T000000
-RDATE:19900211T000000
-RDATE:19910217T000000
-RDATE:19920209T000000
-RDATE:19930131T000000
-RDATE:19960211T000000
-RDATE:19970216T000000
-RDATE:19980301T000000
-RDATE:19990221T000000
-RDATE:20000227T000000
-RDATE:20070225T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;UNTIL=20170219T030000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:AMT
-DTSTART:20120226T000000
-RDATE:20120226T000000
-RDATE:20150222T000000
-RDATE:20230226T000000
-RDATE:20260222T000000
-RDATE:20340226T000000
-RDATE:20370222T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cancun.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cancun.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cancun.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,85 +1,86 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Cancun
 X-LIC-LOCATION:America/Cancun
+BEGIN:STANDARD
+DTSTART:19220101T001256
+RDATE:19220101T001256
+TZNAME:CST
+TZOFFSETFROM:-054704
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19811223T000000
+RDATE:19811223T000000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=19980405T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19980405T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=19971026T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T060000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19980802T020000
+RDATE:19980802T020000
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19981025T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19981025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19990404T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19990404T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20010506T020000
+RDATE:20010506T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20010930T020000
+RDATE:20010930T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20021027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054704
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19220101T001256
-RDATE:19220101T001256
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19811223T000000
-RDATE:19811223T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19980802T020000
-RDATE:19980802T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20010506T020000
-RDATE:20010506T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20010930T020000
-RDATE:20010930T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Caracas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Caracas.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Caracas.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Caracas
 X-LIC-LOCATION:America/Caracas
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
 TZOFFSETFROM:-042744
 TZOFFSETTO:-042740
-TZNAME:CMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120212T000000
+RDATE:19120212T000000
+TZNAME:VET
 TZOFFSETFROM:-042740
 TZOFFSETTO:-0430
-TZNAME:VET
-DTSTART:19120212T000000
-RDATE:19120212T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19650101T000000
+RDATE:19650101T000000
+TZNAME:VET
 TZOFFSETFROM:-0430
 TZOFFSETTO:-0400
-TZNAME:VET
-DTSTART:19650101T000000
-RDATE:19650101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20071209T030000
+RDATE:20071209T030000
+TZNAME:VET
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0430
-TZNAME:VET
-DTSTART:20071209T030000
-RDATE:20071209T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Catamarca.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Catamarca.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Catamarca.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,172 +1,173 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Catamarca
 X-LIC-LOCATION:America/Catamarca
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042308
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-042308
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910303T000000
 RDATE:19910303T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911020T000000
+RDATE:19911020T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:19911020T000000
-RDATE:19911020T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:ARST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
 RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20040601T000000
+RDATE:20040601T000000
+TZNAME:WART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:20040601T000000
-RDATE:20040601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayenne.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayenne.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayenne.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Cayenne
 X-LIC-LOCATION:America/Cayenne
 BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:GFT
 TZOFFSETFROM:-032920
 TZOFFSETTO:-0400
-TZNAME:GFT
-DTSTART:19110701T000000
-RDATE:19110701T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19671001T000000
+RDATE:19671001T000000
+TZNAME:GFT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:GFT
-DTSTART:19671001T000000
-RDATE:19671001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayman.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayman.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayman.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Cayman
 X-LIC-LOCATION:America/Cayman
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KMT
 TZOFFSETFROM:-052532
 TZOFFSETTO:-050712
-TZNAME:KMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120201T000000
+RDATE:19120201T000000
+TZNAME:EST
 TZOFFSETFROM:-050712
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19120201T000000
-RDATE:19120201T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chicago.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chicago.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chicago.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,155 +1,177 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Chicago
 X-LIC-LOCATION:America/Chicago
+BEGIN:STANDARD
+DTSTART:18831118T120924
+RDATE:18831118T120924
+TZNAME:CST
+TZOFFSETFROM:-055036
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
 TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19211030T070000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200613T020000
+RDATE:19200613T020000
+RDATE:19210327T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19220430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19350428T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19201031T020000
+RRULE:FREQ=YEARLY;UNTIL=19211030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19220924T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19350929T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19220430T020000
+RRULE:FREQ=YEARLY;UNTIL=19350428T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19370425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19220924T020000
+RRULE:FREQ=YEARLY;UNTIL=19350929T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19360301T020000
+RDATE:19360301T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19361115T020000
+RDATE:19361115T020000
+RDATE:19450930T020000
 TZNAME:CST
-DTSTART:19370926T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19370425T020000
+RRULE:FREQ=YEARLY;UNTIL=19410427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19370926T020000
+RRULE:FREQ=YEARLY;UNTIL=19410928T070000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-055036
-TZOFFSETTO:-0600
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:18831118T120924
-RDATE:18831118T120924
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19200613T020000
-RDATE:19200613T020000
-RDATE:19210327T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19360301T020000
-RDATE:19360301T020000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19361115T020000
-RDATE:19361115T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chihuahua.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chihuahua.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chihuahua.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,97 +1,98 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Chihuahua
 X-LIC-LOCATION:America/Chihuahua
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19970406T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T070000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
+DTSTART:19211231T235540
+RDATE:19211231T235540
 TZNAME:MST
-DTSTART:19981025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T080000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19990404T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T090000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20021027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-070420
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19211231T235540
-RDATE:19211231T235540
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19270610T230000
 RDATE:19270610T230000
 RDATE:19310501T230000
 RDATE:19320401T000000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
 DTSTART:19301115T000000
 RDATE:19301115T000000
 RDATE:19311001T000000
 RDATE:20010930T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19960101T000000
 RDATE:19960101T000000
 RDATE:19980101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=19970406T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=19971026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19980405T030000
+RDATE:19980405T030000
 TZNAME:MDT
-DTSTART:19980405T020000
-RDATE:19980405T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19981025T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19990404T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 DTSTART:20010506T020000
 RDATE:20010506T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Coral_Harbour.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Coral_Harbour.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Coral_Harbour.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Coral_Harbour
 X-LIC-LOCATION:America/Coral_Harbour
 BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CST
 TZOFFSETFROM:-060628
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18950101T000000
-RDATE:18950101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19400929T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181031T020000
-RDATE:19181031T020000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400929T000000
+RDATE:19400929T000000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T030000
+RDATE:19420209T030000
+TZNAME:CWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:EST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cordoba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cordoba.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cordoba.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,176 +1,165 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Cordoba
 X-LIC-LOCATION:America/Cordoba
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-041648
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19200501T000000
+RDATE:19200501T000000
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:20080316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+RDATE:20081019T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19910303T000000
-RDATE:19910303T000000
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
 TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910303T000000
+RDATE:19910303T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19911020T000000
 RDATE:19911020T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
 TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+RDATE:20000303T000000
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080316T000000
+RRULE:FREQ=YEARLY;UNTIL=20090315T020000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:ART
-DTSTART:20000303T000000
-RDATE:20000303T000000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Costa_Rica.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Costa_Rica.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Costa_Rica.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,52 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Costa_Rica
 X-LIC-LOCATION:America/Costa_Rica
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:SJMT
+TZOFFSETFROM:-053620
+TZOFFSETTO:-053620
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19210115T000000
+RDATE:19210115T000000
+TZNAME:CST
+TZOFFSETFROM:-053620
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790225T000000
+RRULE:FREQ=YEARLY;UNTIL=19800224T060000Z;BYDAY=-1SU;BYMONTH=2
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19790225T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=-1SU;UNTIL=19800224T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790603T000000
+RRULE:FREQ=YEARLY;UNTIL=19800601T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19790603T000000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19800601T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19910119T000000
+RRULE:FREQ=YEARLY;UNTIL=19920118T060000Z;BYDAY=3SA;BYMONTH=1
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19910119T000000
-RRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=3SA;UNTIL=19920118T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-053620
-TZOFFSETTO:-053620
-TZNAME:SJMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-053620
-TZOFFSETTO:-0600
+DTSTART:19910701T000000
+RDATE:19910701T000000
+RDATE:19920315T000000
 TZNAME:CST
-DTSTART:19210115T000000
-RDATE:19210115T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19910701T000000
-RDATE:19910701T000000
-RDATE:19920315T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cuiaba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cuiaba.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cuiaba.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,210 +1,182 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Cuiaba
 X-LIC-LOCATION:America/Cuiaba
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-034420
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19901021T000000
+RDATE:19911020T000000
+RDATE:19921025T000000
+RDATE:19961006T000000
+RDATE:19971006T000000
+RDATE:19981011T000000
+RDATE:19991003T000000
+RDATE:20021103T000000
+RDATE:20041102T000000
+RDATE:20051016T000000
+RDATE:20061105T000000
+RDATE:20071014T000000
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
 TZNAME:AMT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z;BYMONTH=12
 TZNAME:AMST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19931017T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19951015T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19500416T010000
+RDATE:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19910217T000000
+RDATE:19920209T000000
+RDATE:19930131T000000
+RDATE:19960211T000000
+RDATE:19970216T000000
+RDATE:19980301T000000
+RDATE:19990221T000000
+RDATE:20000227T000000
+RDATE:20070225T000000
+RDATE:20120226T000000
+RDATE:20150222T000000
+TZNAME:AMT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z;BYMONTH=4
 TZNAME:AMT
-DTSTART:19940220T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=19950219T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z;BYMONTH=3
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z;BYMONTH=11
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19961006T000000
-RRULE:FREQ=YEARLY;UNTIL=19971006T040000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;UNTIL=19951015T040000Z;BYDAY=-3SU;BYMONTH=10
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;UNTIL=19950219T030000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:AMT
-DTSTART:20010218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20030216T030000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:20050220T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20060219T030000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:20080217T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20110220T030000Z
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;UNTIL=20011014T040000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;UNTIL=20030216T030000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:AMT
-DTSTART:20130217T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20140216T040000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:20160221T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20220220T040000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20030924T000000
+RDATE:20030924T000000
+TZNAME:AMT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:20240218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20250216T040000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20041001T000000
+RDATE:20041001T000000
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:20270221T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20330220T040000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
+DTSTART:20050220T000000
+RRULE:FREQ=YEARLY;UNTIL=20060219T030000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:AMT
-DTSTART:20350218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20360217T040000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-034420
-TZOFFSETTO:-0400
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;UNTIL=20110220T030000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:AMT
-DTSTART:19140101T000000
-RDATE:19140101T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-RDATE:19881016T000000
-RDATE:19891015T000000
-RDATE:19901021T000000
-RDATE:19911020T000000
-RDATE:19921025T000000
-RDATE:19981011T000000
-RDATE:19991003T000000
-RDATE:20021103T000000
-RDATE:20041102T000000
-RDATE:20051016T000000
-RDATE:20061105T000000
-RDATE:20071014T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;UNTIL=20140216T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19500416T010000
-RDATE:19500416T010000
-RDATE:19530301T000000
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:19890129T000000
-RDATE:19900211T000000
-RDATE:19910217T000000
-RDATE:19920209T000000
-RDATE:19930131T000000
-RDATE:19960211T000000
-RDATE:19970216T000000
-RDATE:19980301T000000
-RDATE:19990221T000000
-RDATE:20000227T000000
-RDATE:20070225T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;UNTIL=20170219T030000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:AMT
-DTSTART:20030924T000000
-RDATE:20030924T000000
-RDATE:20041001T000000
-RDATE:20120226T000000
-RDATE:20150222T000000
-RDATE:20230226T000000
-RDATE:20260222T000000
-RDATE:20340226T000000
-RDATE:20370222T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Curacao.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Curacao.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Curacao.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Curacao
 X-LIC-LOCATION:America/Curacao
 BEGIN:STANDARD
+DTSTART:19120212T000000
+RDATE:19120212T000000
+TZNAME:ANT
 TZOFFSETFROM:-043544
 TZOFFSETTO:-0430
-TZNAME:ANT
-DTSTART:19120212T000000
-RDATE:19120212T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19650101T000000
+RDATE:19650101T000000
+TZNAME:AST
 TZOFFSETFROM:-0430
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19650101T000000
-RDATE:19650101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Danmarkshavn.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Danmarkshavn.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Danmarkshavn.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,46 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Danmarkshavn
 X-LIC-LOCATION:America/Danmarkshavn
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+DTSTART:19160728T000000
+RDATE:19160728T000000
+TZNAME:WGT
+TZOFFSETFROM:-011440
 TZOFFSETTO:-0300
-TZNAME:WGT
-DTSTART:19800927T230000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SA;UNTIL=19950924T010000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19800406T020000
+RDATE:19800406T020000
+TZNAME:WGST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:WGST
-DTSTART:19810328T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SA;UNTIL=19950326T010000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-011440
+DTSTART:19800927T230000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=SA;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=9
+TZNAME:WGT
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:WGT
-DTSTART:19160728T000000
-RDATE:19160728T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810328T220000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=SA;BYMONTHDAY=24,25,26,27,2
+ 8,29,30;BYMONTH=3
+TZNAME:WGST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:WGST
-DTSTART:19800406T020000
-RDATE:19800406T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT
 TZOFFSETFROM:-0300
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,108 +1,110 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Dawson
 X-LIC-LOCATION:America/Dawson
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19000820T000000
+RDATE:19000820T000000
+TZNAME:YST
 TZOFFSETFROM:-091740
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19000820T000000
-RDATE:19000820T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:YDT
 DTSTART:19180414T020000
 RDATE:19180414T020000
 RDATE:19190525T020000
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:YST
 DTSTART:19181027T020000
 RDATE:19181027T020000
 RDATE:19191101T000000
 RDATE:19450930T020000
+TZNAME:YST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:YWT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-TZNAME:YWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T150000
+RDATE:19450814T150000
+TZNAME:YPT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:YPT
-DTSTART:19450814T150000
-RDATE:19450814T150000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:YDDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0700
-TZNAME:YDDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:YST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19651031T020000
-RDATE:19651031T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19731028T000000
+RDATE:19731028T000000
+TZNAME:PST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-DTSTART:19731028T000000
-RDATE:19731028T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:PST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:PST
-DTSTART:19800101T000000
-RDATE:19800101T000000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson_Creek.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson_Creek.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson_Creek.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,79 +1,80 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Dawson_Creek
 X-LIC-LOCATION:America/Dawson_Creek
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19720430T100000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
+DTSTART:18840101T000000
+RDATE:18840101T000000
 TZNAME:PST
-DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T090000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19711031T090000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-080056
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
 DTSTART:19181031T020000
 RDATE:19181031T020000
 RDATE:19450930T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:PWT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0700
-TZNAME:PPT
-DTSTART:19450814T160000
-RDATE:19450814T160000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19470101T000000
+RDATE:19470101T000000
+TZNAME:PST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19720430T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;UNTIL=19610924T090000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:PST
-DTSTART:19470101T000000
-RDATE:19470101T000000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19711031T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19720830T020000
 RDATE:19720830T020000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Denver.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Denver.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Denver.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,111 +1,134 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Denver
 X-LIC-LOCATION:America/Denver
+BEGIN:STANDARD
+DTSTART:18831118T120004
+RDATE:18831118T120004
+TZNAME:MST
+TZOFFSETFROM:-065956
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19210327T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
 TZNAME:MST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T080000Z
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200328T020000
+RRULE:FREQ=YEARLY;UNTIL=19210327T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19650425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19210522T020000
+RDATE:19450930T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19651031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19650425T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-065956
-TZOFFSETTO:-0700
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:MST
-DTSTART:18831118T120004
-RDATE:18831118T120004
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19210522T020000
-RDATE:19210522T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZNAME:MDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Detroit.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Detroit.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Detroit.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,101 +1,115 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Detroit
 X-LIC-LOCATION:America/Detroit
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19731028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19050101T000000
+RDATE:19050101T000000
+TZNAME:CST
 TZOFFSETFROM:-053211
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19050101T000000
-RDATE:19050101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19150515T020000
+RDATE:19150515T020000
+TZNAME:EST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19150515T020000
-RDATE:19150515T020000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19420101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
 RDATE:19730101T000000
 RDATE:19750101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:EWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19450930T020000
 RDATE:19450930T020000
 RDATE:19480926T020000
 RDATE:19671029T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
 DTSTART:19480425T020000
 RDATE:19480425T020000
 RDATE:19670614T020000
 RDATE:19730429T020000
 RDATE:19740106T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19731028T020000
+RRULE:FREQ=YEARLY;UNTIL=19741027T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19750427T020000
 RDATE:19750427T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dominica.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dominica.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dominica.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Dominica
 X-LIC-LOCATION:America/Dominica
 BEGIN:STANDARD
+DTSTART:19110701T000100
+RDATE:19110701T000100
+TZNAME:AST
 TZOFFSETFROM:-040536
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110701T000100
-RDATE:19110701T000100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Edmonton.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Edmonton.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Edmonton.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,114 +1,122 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Edmonton
 X-LIC-LOCATION:America/Edmonton
+BEGIN:STANDARD
+DTSTART:19060901T000000
+RDATE:19060901T000000
+TZNAME:MST
+TZOFFSETFROM:-073352
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
+DTSTART:19180414T020000
+RRULE:FREQ=YEARLY;UNTIL=19190413T090000Z;BYDAY=2SU;BYMONTH=4
 TZNAME:MDT
-DTSTART:19180414T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=2SU;UNTIL=19190413T090000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19200425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19230429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19190527T020000
+RDATE:19201031T020000
+RDATE:19450930T020000
+RDATE:19470928T020000
+RDATE:19671029T020000
+RDATE:19691026T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19230930T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200425T020000
+RRULE:FREQ=YEARLY;UNTIL=19230429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19720430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;UNTIL=19230930T080000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19721029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RDATE:19470427T020000
+RDATE:19670430T020000
+RDATE:19690427T020000
 TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19720430T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-073352
-TZOFFSETTO:-0700
+DTSTART:19870101T000000
+RDATE:19870101T000000
 TZNAME:MST
-DTSTART:19060901T000000
-RDATE:19060901T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19190527T020000
-RDATE:19201031T020000
-RDATE:19450930T020000
-RDATE:19470928T020000
-RDATE:19671029T020000
-RDATE:19691026T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
-END:DAYLIGHT
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19470427T020000
-RDATE:19470427T020000
-RDATE:19670430T020000
-RDATE:19690427T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19870101T000000
-RDATE:19870101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Eirunepe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Eirunepe.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Eirunepe.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,75 +1,47 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Eirunepe
 X-LIC-LOCATION:America/Eirunepe
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:ACST
+TZOFFSETFROM:-043928
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+RDATE:19931017T000000
+TZNAME:ACST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
 TZNAME:ACT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
 TZNAME:ACST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-043928
-TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-RDATE:19931017T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:ACT
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -79,22 +51,52 @@
 RDATE:19870214T000000
 RDATE:19880207T000000
 RDATE:19940220T000000
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z;BYMONTH=4
+TZNAME:ACT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z;BYMONTH=3
 TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z;BYMONTH=11
+TZNAME:ACST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
-RDATE:19930928T000000
 RDATE:19940922T000000
+TZNAME:ACT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19930928T000000
+RDATE:19930928T000000
+TZNAME:ACST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:AMT
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20080624T000000
 RDATE:20080624T000000
+TZNAME:AMT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/El_Salvador.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/El_Salvador.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/El_Salvador.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/El_Salvador
 X-LIC-LOCATION:America/El_Salvador
+BEGIN:STANDARD
+DTSTART:19210101T000000
+RDATE:19210101T000000
+TZNAME:CST
+TZOFFSETFROM:-055648
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870503T000000
+RRULE:FREQ=YEARLY;UNTIL=19880501T060000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870503T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19880501T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19870927T000000
+RRULE:FREQ=YEARLY;UNTIL=19880925T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19870927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880925T050000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-055648
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19210101T000000
-RDATE:19210101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ensenada.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ensenada.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ensenada.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,102 +1,154 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Ensenada
 X-LIC-LOCATION:America/Ensenada
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19220101T001156
+RDATE:19220101T001156
+TZNAME:MST
+TZOFFSETFROM:-074804
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240101T000000
+RDATE:19240101T000000
+RDATE:19301115T000000
+RDATE:19310930T000000
+RDATE:19451112T000000
+RDATE:19490114T000000
+RDATE:20011028T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19270610T230000
+RDATE:19270610T230000
+TZNAME:MST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19480405T000000
 TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420424T000000
+RDATE:19420424T000000
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19540101T000000
+RDATE:19540101T000000
+RDATE:19610101T000000
+RDATE:19760101T000000
+RDATE:19960101T000000
+RDATE:20010101T000000
+RDATE:20020220T000000
+RDATE:20100101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19540425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T100000Z
+RRULE:FREQ=YEARLY;UNTIL=19600424T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19540926T020000
+RRULE:FREQ=YEARLY;UNTIL=19600925T090000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19540926T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19761031T020000
+RRULE:FREQ=YEARLY;UNTIL=19951029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19761031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19950402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T100000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-074804
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19220101T001156
-RDATE:19220101T001156
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19240101T000000
-RDATE:19240101T000000
-RDATE:19301115T000000
-RDATE:19310930T000000
-RDATE:19451112T000000
-RDATE:19490114T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19270610T230000
-RDATE:19270610T230000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010401T020000
+RDATE:20010401T020000
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19480405T000000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20090405T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PWT
-DTSTART:19420424T000000
-RDATE:19420424T000000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;UNTIL=20091025T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PPT
-DTSTART:19450814T160000
-RDATE:19450814T160000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
+DTSTART:20101107T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19540101T000000
-RDATE:19540101T000000
-RDATE:19610101T000000
-RDATE:19760101T000000
-RDATE:19960101T000000
-RDATE:20010101T000000
-RDATE:20020220T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fort_Wayne.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fort_Wayne.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fort_Wayne.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,141 +1,142 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Fort_Wayne
 X-LIC-LOCATION:America/Fort_Wayne
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:18831118T121522
+RDATE:18831118T121522
+TZNAME:CST
+TZOFFSETFROM:-054438
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054438
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121522
-RDATE:18831118T121522
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19200101T000000
 RDATE:19200101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19410622T020000
+RDATE:19410622T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19410622T020000
-RDATE:19410622T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19410928T020000
 RDATE:19410928T020000
 RDATE:19450930T020000
 RDATE:19570929T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19550424T020000
 RDATE:19550424T020000
 RDATE:19580427T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19690101T000000
 RDATE:19690101T000000
 RDATE:19710101T000000
 RDATE:20060101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19700426T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19701025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:20060402T020000
 RDATE:20060402T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20061029T020000
+RDATE:20061029T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:EST
-DTSTART:20061029T020000
-RDATE:20061029T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fortaleza.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fortaleza.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fortaleza.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,69 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Fortaleza
 X-LIC-LOCATION:America/Fortaleza
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19140101T000000
+RDATE:19140101T000000
 TZNAME:BRST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:-0234
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19140101T000000
-RDATE:19140101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
 DTSTART:19311003T110000
 RDATE:19311003T110000
 RDATE:19321003T000000
@@ -71,14 +20,32 @@
 RDATE:19650131T000000
 RDATE:19651201T000000
 RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
 RDATE:19881016T000000
 RDATE:19891015T000000
 RDATE:19991003T000000
+RDATE:20001008T000000
+RDATE:20011014T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z;BYMONTH=12
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -92,16 +59,46 @@
 RDATE:20000227T000000
 RDATE:20001022T000000
 RDATE:20020217T000000
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z;BYMONTH=4
+TZNAME:BRT
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z;BYMONTH=3
 TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z;BYMONTH=11
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900917T000000
 RDATE:19900917T000000
+RDATE:20021001T000000
+TZNAME:BRT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990930T000000
 RDATE:19990930T000000
 RDATE:20010913T000000
-RDATE:20021001T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Glace_Bay.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Glace_Bay.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Glace_Bay.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,96 +1,106 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Glace_Bay
 X-LIC-LOCATION:America/Glace_Bay
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19020615T000000
+RDATE:19020615T000000
+TZNAME:AST
+TZOFFSETFROM:-035948
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19530101T000000
-RRULE:FREQ=YEARLY;UNTIL=19540101T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19530426T020000
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19720430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+RDATE:19530927T020000
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19721029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19530101T000000
+RDATE:19530101T000000
+RDATE:19540101T000000
+RDATE:19720101T000000
+RDATE:19740101T000000
+TZNAME:AST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19720430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-035948
+DTSTART:19721029T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19020615T000000
-RDATE:19020615T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19530426T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
-RDATE:19530927T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T060000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:APT
-DTSTART:19450814T200000
-RDATE:19450814T200000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19720101T000000
-RDATE:19720101T000000
-RDATE:19740101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Godthab.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Godthab.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Godthab.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,45 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Godthab
 X-LIC-LOCATION:America/Godthab
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+DTSTART:19160728T000000
+RDATE:19160728T000000
+TZNAME:WGT
+TZOFFSETFROM:-032656
 TZOFFSETTO:-0300
-TZNAME:WGT
-DTSTART:19800927T230000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SA;UNTIL=19950924T010000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19800406T020000
+RDATE:19800406T020000
+TZNAME:WGST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:WGST
-DTSTART:19810328T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SA
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19800927T230000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=SA;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=9
+TZNAME:WGT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:WGT
-DTSTART:19961026T230000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SA
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-032656
-TZOFFSETTO:-0300
-TZNAME:WGT
-DTSTART:19160728T000000
-RDATE:19160728T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810328T220000
+RRULE:FREQ=YEARLY;BYDAY=SA;BYMONTHDAY=24,25,26,27,28,29,30;BYMONTH=3
+TZNAME:WGST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:WGST
-DTSTART:19800406T020000
-RDATE:19800406T020000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961026T230000
+RRULE:FREQ=YEARLY;BYDAY=SA;BYMONTHDAY=24,25,26,27,28,29,30;BYMONTH=10
+TZNAME:WGT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Goose_Bay.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Goose_Bay.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Goose_Bay.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,198 +1,203 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Goose_Bay
 X-LIC-LOCATION:America/Goose_Bay
 BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:NST
+TZOFFSETFROM:-040140
+TZOFFSETTO:-033052
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+RDATE:19190101T000000
+TZNAME:NST
 TZOFFSETFROM:-033052
 TZOFFSETTO:-033052
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:NDT
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
 TZNAME:NST
-DTSTART:19180101T000000
-RRULE:FREQ=YEARLY;UNTIL=19190101T033052Z
+TZOFFSETFROM:-023052
+TZOFFSETTO:-033052
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19350330T000000
+RDATE:19350330T000000
+TZNAME:NST
+TZOFFSETFROM:-033052
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19360101T000000
+RDATE:19360101T000000
+RDATE:19460101T000000
+TZNAME:NST
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0330
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19360511T000000
+RRULE:FREQ=YEARLY;UNTIL=19410512T033000Z;BYDAY=MO;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=5
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19360511T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=MO;UNTIL=19410512T033000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19361005T000000
+RRULE:FREQ=YEARLY;UNTIL=19411006T023000Z;BYDAY=MO;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420511T000000
+RDATE:19420511T000000
 TZNAME:NST
-DTSTART:19361005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19411006T023000Z
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19450814T203000
+RDATE:19450814T203000
+TZNAME:NPT
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19460512T020000
+RRULE:FREQ=YEARLY;UNTIL=19500514T053000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19460512T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19500514T053000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19461006T020000
+RRULE:FREQ=YEARLY;UNTIL=19501008T043000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19461006T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19501008T043000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19650425T053000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19650425T053000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T043000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T043000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19601030T020000
+RRULE:FREQ=YEARLY;UNTIL=19651031T043000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19601030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19651031T043000Z
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19660424T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19660315T020000
+RDATE:19660315T020000
+TZNAME:AST
+TZOFFSETFROM:-0330
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19661030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19861026T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19660424T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19890402T000100
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T040100Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19661030T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19891029T000100
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T030100Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T000100
+RDATE:19870405T000100
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:20070311T000100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19871025T000100
+RDATE:19871025T000100
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:20071104T000100
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-040140
-TZOFFSETTO:-033052
-TZNAME:NST
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-033052
-TZOFFSETTO:-023052
-TZNAME:NDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
+DTSTART:19880403T000100
+RDATE:19880403T000100
+TZNAME:ADDT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-023052
-TZOFFSETTO:-033052
-TZNAME:NST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-033052
-TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19350330T000000
-RDATE:19350330T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19360101T000000
-RDATE:19360101T000000
-RDATE:19460101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-TZNAME:NWT
-DTSTART:19420511T000000
-RDATE:19420511T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0230
-TZNAME:NPT
-DTSTART:19450814T203000
-RDATE:19450814T203000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0330
+DTSTART:19881030T000100
+RDATE:19881030T000100
+TZNAME:AST
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19660315T020000
-RDATE:19660315T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19890402T000100
+RRULE:FREQ=YEARLY;UNTIL=20060402T040100Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19870405T000100
-RDATE:19870405T000100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19891029T000100
+RRULE:FREQ=YEARLY;UNTIL=20061029T030100Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19871025T000100
-RDATE:19871025T000100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
 TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-TZNAME:ADDT
-DTSTART:19880403T000100
-RDATE:19880403T000100
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19881030T000100
-RDATE:19881030T000100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grand_Turk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grand_Turk.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grand_Turk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Grand_Turk
 X-LIC-LOCATION:America/Grand_Turk
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KMT
+TZOFFSETFROM:-044432
+TZOFFSETTO:-050712
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120201T000000
+RDATE:19120201T000000
+TZNAME:EST
+TZOFFSETFROM:-050712
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19790429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19791028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19791028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-044432
-TZOFFSETTO:-050712
-TZNAME:KMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-050712
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19120201T000000
-RDATE:19120201T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grenada.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grenada.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grenada.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Grenada
 X-LIC-LOCATION:America/Grenada
 BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:AST
 TZOFFSETFROM:-0407
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110701T000000
-RDATE:19110701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guadeloupe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guadeloupe.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guadeloupe.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Guadeloupe
 X-LIC-LOCATION:America/Guadeloupe
 BEGIN:STANDARD
+DTSTART:19110608T000000
+RDATE:19110608T000000
+TZNAME:AST
 TZOFFSETFROM:-040608
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110608T000000
-RDATE:19110608T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guatemala.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guatemala.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guatemala.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,35 +1,36 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Guatemala
 X-LIC-LOCATION:America/Guatemala
 BEGIN:STANDARD
+DTSTART:19181005T000000
+RDATE:19181005T000000
+TZNAME:CST
 TZOFFSETFROM:-060204
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181005T000000
-RDATE:19181005T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
 DTSTART:19731125T000000
 RDATE:19731125T000000
 RDATE:19830521T000000
 RDATE:19910323T000000
 RDATE:20060430T000000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19740224T000000
 RDATE:19740224T000000
 RDATE:19830922T000000
 RDATE:19910907T000000
 RDATE:20061001T000000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guayaquil.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guayaquil.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guayaquil.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Guayaquil
 X-LIC-LOCATION:America/Guayaquil
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:QMT
 TZOFFSETFROM:-051920
 TZOFFSETTO:-0514
-TZNAME:QMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:ECT
 TZOFFSETFROM:-0514
 TZOFFSETTO:-0500
-TZNAME:ECT
-DTSTART:19310101T000000
-RDATE:19310101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guyana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guyana.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guyana.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Guyana
 X-LIC-LOCATION:America/Guyana
 BEGIN:STANDARD
+DTSTART:19150301T000000
+RDATE:19150301T000000
+TZNAME:GBGT
 TZOFFSETFROM:-035240
 TZOFFSETTO:-0345
-TZNAME:GBGT
-DTSTART:19150301T000000
-RDATE:19150301T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19660526T000000
+RDATE:19660526T000000
+TZNAME:GYT
 TZOFFSETFROM:-0345
 TZOFFSETTO:-0345
-TZNAME:GYT
-DTSTART:19660526T000000
-RDATE:19660526T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19750731T000000
+RDATE:19750731T000000
+TZNAME:GYT
 TZOFFSETFROM:-0345
 TZOFFSETTO:-0300
-TZNAME:GYT
-DTSTART:19750731T000000
-RDATE:19750731T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+TZNAME:GYT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:GYT
-DTSTART:19910101T000000
-RDATE:19910101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Halifax.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Halifax.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Halifax.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,211 +1,221 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Halifax
 X-LIC-LOCATION:America/Halifax
 BEGIN:STANDARD
+DTSTART:19020615T000000
+RDATE:19020615T000000
+TZNAME:AST
+TZOFFSETFROM:-041424
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160401T000000
+RDATE:19160401T000000
+RDATE:19180414T020000
+RDATE:19200509T000000
+RDATE:19210506T000000
+RDATE:19220430T000000
+RDATE:19260516T000000
+RDATE:19270501T000000
+RDATE:19320501T000000
+RDATE:19330430T000000
+RDATE:19340520T000000
+RDATE:19350602T000000
+RDATE:19360601T000000
+RDATE:19390528T000000
+TZNAME:ADT
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T000000
+RDATE:19161001T000000
+RDATE:19181031T020000
+RDATE:19200829T000000
+RDATE:19230904T000000
+RDATE:19240915T000000
+RDATE:19250928T000000
+RDATE:19260913T000000
+RDATE:19270926T000000
+RDATE:19280909T000000
+RDATE:19290903T000000
+RDATE:19300915T000000
+RDATE:19331002T000000
+RDATE:19340916T000000
+RDATE:19350930T000000
+RDATE:19360914T000000
+RDATE:19450930T020000
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+RDATE:19190101T000000
+RDATE:19460101T000000
+RDATE:19740101T000000
 TZNAME:AST
-DTSTART:19180101T000000
-RRULE:FREQ=YEARLY;UNTIL=19190101T040000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19210905T000000
+RRULE:FREQ=YEARLY;UNTIL=19220905T030000Z;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19210905T000000
-RRULE:FREQ=YEARLY;UNTIL=19220905T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19230506T000000
+RRULE:FREQ=YEARLY;UNTIL=19250503T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19230506T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19250503T040000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19280513T000000
+RRULE:FREQ=YEARLY;UNTIL=19310510T040000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19280513T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19310510T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310928T000000
+RRULE:FREQ=YEARLY;UNTIL=19320926T030000Z;BYDAY=-1MO;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19310928T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1MO;UNTIL=19320926T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19370502T000000
+RRULE:FREQ=YEARLY;UNTIL=19380501T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19370502T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19380501T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19370927T000000
+RRULE:FREQ=YEARLY;UNTIL=19410929T030000Z;BYDAY=-1MO;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19370927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1MO;UNTIL=19410929T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19400505T000000
+RRULE:FREQ=YEARLY;UNTIL=19410504T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19400505T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19410504T040000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T060000Z
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19490925T050000Z
-END:STANDARD
+TZOFFSETTO:-0300
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19490424T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19490925T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19560429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19590426T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19560930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;UNTIL=19590426T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19620429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19560930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19620429T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T060000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:ADT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041424
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19020615T000000
-RDATE:19020615T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19160401T000000
-RDATE:19160401T000000
-RDATE:19180414T020000
-RDATE:19200509T000000
-RDATE:19210506T000000
-RDATE:19220430T000000
-RDATE:19260516T000000
-RDATE:19270501T000000
-RDATE:19320501T000000
-RDATE:19330430T000000
-RDATE:19340520T000000
-RDATE:19350602T000000
-RDATE:19360601T000000
-RDATE:19390528T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19161001T000000
-RDATE:19161001T000000
-RDATE:19181031T020000
-RDATE:19200829T000000
-RDATE:19230904T000000
-RDATE:19240915T000000
-RDATE:19250928T000000
-RDATE:19260913T000000
-RDATE:19270926T000000
-RDATE:19280909T000000
-RDATE:19290903T000000
-RDATE:19300915T000000
-RDATE:19331002T000000
-RDATE:19340916T000000
-RDATE:19350930T000000
-RDATE:19360914T000000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T060000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:APT
-DTSTART:19450814T200000
-RDATE:19450814T200000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19460101T000000
-RDATE:19460101T000000
-RDATE:19740101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Havana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Havana.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Havana.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,193 +1,190 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Havana
 X-LIC-LOCATION:America/Havana
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:HMT
+TZOFFSETFROM:-052928
+TZOFFSETTO:-052936
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19250719T120000
+RDATE:19250719T120000
+TZNAME:CST
+TZOFFSETFROM:-052936
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280610T000000
+RDATE:19280610T000000
+RDATE:19650601T000000
+RDATE:19660529T000000
+RDATE:19670408T000000
+RDATE:19680414T000000
+RDATE:19780507T000000
+RDATE:20070311T000000
+RDATE:20080316T000000
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19400602T000000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19420607T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19281010T000000
+RDATE:19281010T000000
+RDATE:19650930T000000
+RDATE:19661002T000000
+RDATE:19961006T010000
+RDATE:19971012T010000
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19400901T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=19420906T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19400602T000000
+RRULE:FREQ=YEARLY;UNTIL=19420607T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19450603T000000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19460602T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19400901T000000
+RRULE:FREQ=YEARLY;UNTIL=19420906T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19450902T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=19460901T040000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19450603T000000
+RRULE:FREQ=YEARLY;UNTIL=19460602T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450902T000000
+RRULE:FREQ=YEARLY;UNTIL=19460901T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19670910T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=2SU;UNTIL=19680908T040000Z
+RRULE:FREQ=YEARLY;UNTIL=19680908T040000Z;BYDAY=2SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T000000
+RRULE:FREQ=YEARLY;UNTIL=19770424T050000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19690427T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19770424T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19691026T000000
+RRULE:FREQ=YEARLY;UNTIL=19711031T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19691026T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19711031T040000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19721008T000000
+RRULE:FREQ=YEARLY;UNTIL=19741008T040000Z;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19721008T000000
-RRULE:FREQ=YEARLY;UNTIL=19741008T040000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19751026T000000
+RRULE:FREQ=YEARLY;UNTIL=19771030T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19751026T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19771030T040000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19781008T000000
+RRULE:FREQ=YEARLY;UNTIL=19901014T040000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19781008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19901014T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790318T000000
+RRULE:FREQ=YEARLY;UNTIL=19800316T050000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19790318T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19800316T050000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19810510T000000
+RRULE:FREQ=YEARLY;UNTIL=19850505T050000Z;BYDAY=SU;BYMONTHDAY=5,6,7,8,9,10,
+ 11;BYMONTH=5
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19810510T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=5,6,7,8,9,10,11;BYDAY=SU;UNTIL=19850505T050000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19860316T000000
+RRULE:FREQ=YEARLY;UNTIL=19890319T050000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19860316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19890319T050000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19900401T000000
+RRULE:FREQ=YEARLY;UNTIL=19970406T050000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19900401T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19970406T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19911013T010000
+RRULE:FREQ=YEARLY;UNTIL=19951008T050000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19911013T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19951008T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19980329T000000
+RRULE:FREQ=YEARLY;UNTIL=19990328T050000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19980329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19990328T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19981025T010000
+RRULE:FREQ=YEARLY;UNTIL=20031026T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19981025T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031026T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:CDT
 DTSTART:20000402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20040404T050000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
+RRULE:FREQ=YEARLY;UNTIL=20040404T050000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:20050403T010000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T050000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:20061029T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:20080316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-052928
-TZOFFSETTO:-052936
-TZNAME:HMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-052936
-TZOFFSETTO:-0500
+DTSTART:20061029T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19250719T120000
-RDATE:19250719T120000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20090308T000000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19280610T000000
-RDATE:19280610T000000
-RDATE:19650601T000000
-RDATE:19660529T000000
-RDATE:19670408T000000
-RDATE:19680414T000000
-RDATE:19780507T000000
-RDATE:20070311T000000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19281010T000000
-RDATE:19281010T000000
-RDATE:19650930T000000
-RDATE:19661002T000000
-RDATE:19961006T010000
-RDATE:19971012T010000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Hermosillo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Hermosillo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Hermosillo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,68 +1,69 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Hermosillo
 X-LIC-LOCATION:America/Hermosillo
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19980405T090000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
+DTSTART:19211231T233608
+RDATE:19211231T233608
 TZNAME:MST
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19981025T080000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-072352
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19211231T233608
-RDATE:19211231T233608
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19270610T230000
 RDATE:19270610T230000
 RDATE:19310501T230000
 RDATE:19320401T000000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
 DTSTART:19301115T000000
 RDATE:19301115T000000
 RDATE:19311001T000000
 RDATE:19420424T000000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19490114T000000
+RDATE:19490114T000000
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19490114T000000
-RDATE:19490114T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19700101T000000
+RDATE:19700101T000000
+TZNAME:MST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=19980405T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=19981025T080000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:MST
-DTSTART:19700101T000000
-RDATE:19700101T000000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19990101T000000
+RDATE:19990101T000000
+TZNAME:MST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19990101T000000
-RDATE:19990101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Indianapolis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Indianapolis.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Indianapolis.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,141 +1,142 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Indiana/Indianapolis
 X-LIC-LOCATION:America/Indiana/Indianapolis
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:18831118T121522
+RDATE:18831118T121522
+TZNAME:CST
+TZOFFSETFROM:-054438
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054438
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121522
-RDATE:18831118T121522
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19200101T000000
 RDATE:19200101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19410622T020000
+RDATE:19410622T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19410622T020000
-RDATE:19410622T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19410928T020000
 RDATE:19410928T020000
 RDATE:19450930T020000
 RDATE:19570929T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19550424T020000
 RDATE:19550424T020000
 RDATE:19580427T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19690101T000000
 RDATE:19690101T000000
 RDATE:19710101T000000
 RDATE:20060101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19700426T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19701025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:20060402T020000
 RDATE:20060402T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20061029T020000
+RDATE:20061029T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:EST
-DTSTART:20061029T020000
-RDATE:20061029T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Knox.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Knox.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Knox.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,165 +1,166 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Indiana/Knox
 X-LIC-LOCATION:America/Indiana/Knox
+BEGIN:STANDARD
+DTSTART:18831118T121330
+RDATE:18831118T121330
+TZNAME:CST
+TZOFFSETFROM:-054630
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19610430T080000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19631027T020000
+RDATE:20061029T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19470101T000000
+RDATE:19470101T000000
 TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19610430T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19561028T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19561028T070000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19570929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T070000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19591025T020000
+RRULE:FREQ=YEARLY;UNTIL=19611029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19591025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19611029T070000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19620429T020000
+RDATE:19620429T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19670430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19901028T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901028T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19910407T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19910407T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19911027T020000
+RDATE:19911027T020000
+TZNAME:EST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-054630
-TZOFFSETTO:-0600
+DTSTART:20060402T020000
+RDATE:20060402T020000
 TZNAME:CST
-DTSTART:18831118T121330
-RDATE:18831118T121330
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:19631027T020000
-RDATE:20061029T020000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19470101T000000
-RDATE:19470101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19620429T020000
-RDATE:19620429T020000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19911027T020000
-RDATE:19911027T020000
+TZOFFSETTO:-0600
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20060402T020000
-RDATE:20060402T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Marengo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Marengo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Marengo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,147 +1,148 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Indiana/Marengo
 X-LIC-LOCATION:America/Indiana/Marengo
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:18831118T121437
+RDATE:18831118T121437
+TZNAME:CST
+TZOFFSETFROM:-054523
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19540425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19540926T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19731028T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054523
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121437
-RDATE:18831118T121437
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19450930T020000
 RDATE:19450930T020000
 RDATE:19510930T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:CST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19510101T000000
-RDATE:19510101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RDATE:19510429T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19540425T020000
+RRULE:FREQ=YEARLY;UNTIL=19600424T080000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19510429T020000
-RDATE:19510429T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19540926T020000
+RRULE:FREQ=YEARLY;UNTIL=19600925T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19610430T020000
+RDATE:19610430T020000
+TZNAME:EST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19610430T020000
-RDATE:19610430T020000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19690101T000000
 RDATE:19690101T000000
 RDATE:19741027T020000
 RDATE:19760101T000000
 RDATE:20060101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CDT
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19740106T020000
 RDATE:19740106T020000
-END:DAYLIGHT
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
 DTSTART:19750223T020000
 RDATE:19750223T020000
 RDATE:20060402T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19751026T020000
 RDATE:19751026T020000
 RDATE:20061029T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Petersburg.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Petersburg.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Petersburg.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,147 +1,148 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Indiana/Petersburg
 X-LIC-LOCATION:America/Indiana/Petersburg
+BEGIN:STANDARD
+DTSTART:18831118T121053
+RDATE:18831118T121053
+TZNAME:CST
+TZOFFSETFROM:-054907
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19550925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19560429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19640426T080000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19661030T020000
+RDATE:20061029T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19550101T000000
+RDATE:19550101T000000
 TZNAME:CST
-DTSTART:19611029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19641025T070000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550501T000000
+RDATE:19550501T000000
+RDATE:19740106T020000
+RDATE:19750223T020000
+RDATE:20070311T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19670430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19550925T020000
+RRULE:FREQ=YEARLY;UNTIL=19600925T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19761031T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;UNTIL=19640426T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19770424T080000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19611029T020000
+RRULE:FREQ=YEARLY;UNTIL=19641025T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20080309T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19650425T020000
+RDATE:19650425T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20081102T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054907
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121053
-RDATE:18831118T121053
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19761031T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:19661030T020000
-RDATE:20061029T020000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19550101T000000
-RDATE:19550101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19770424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19550501T000000
-RDATE:19550501T000000
-RDATE:19740106T020000
-RDATE:19750223T020000
-RDATE:20070311T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+DTSTART:19771030T020000
+RDATE:19771030T020000
+RDATE:20071104T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19650425T020000
-RDATE:19650425T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20060402T020000
+RDATE:20060402T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19771030T020000
-RDATE:19771030T020000
-RDATE:20071104T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20080309T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20081102T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20060402T020000
-RDATE:20060402T020000
-END:DAYLIGHT
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Tell_City.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Tell_City.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Tell_City.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,147 +1,148 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Indiana/Tell_City
 X-LIC-LOCATION:America/Indiana/Tell_City
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:18831118T121257
+RDATE:18831118T121257
+TZNAME:CST
+TZOFFSETFROM:-054703
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19530426T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19530927T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19560429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19630428T080000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19631027T070000Z
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19460929T020000
+RDATE:19601030T020000
+RDATE:19610924T020000
+RDATE:20061029T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-054703
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121257
-RDATE:18831118T121257
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RDATE:19460428T020000
+RDATE:19550501T000000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
+DTSTART:19530426T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19530927T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:19460929T020000
-RDATE:19601030T020000
-RDATE:19610924T020000
-RDATE:20061029T020000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19460101T000000
-RDATE:19460101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;UNTIL=19630428T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RDATE:19460428T020000
-RDATE:19550501T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19631027T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19640426T020000
+RDATE:19640426T020000
+TZNAME:EST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19640426T020000
-RDATE:19640426T020000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19690101T000000
 RDATE:19690101T000000
 RDATE:19710101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19700426T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19701025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CDT
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20060402T020000
 RDATE:20060402T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vevay.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vevay.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vevay.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,108 +1,109 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Indiana/Vevay
 X-LIC-LOCATION:America/Indiana/Vevay
+BEGIN:STANDARD
+DTSTART:18831118T121944
+RDATE:18831118T121944
+TZNAME:CST
+TZOFFSETFROM:-054016
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19720430T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19721029T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054016
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121944
-RDATE:18831118T121944
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19540425T020000
+RDATE:19540425T020000
+TZNAME:EST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19540425T020000
-RDATE:19540425T020000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19690101T000000
 RDATE:19690101T000000
 RDATE:19730101T000000
 RDATE:20060101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19720430T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19721029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:20060402T020000
 RDATE:20060402T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20061029T020000
+RDATE:20061029T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:EST
-DTSTART:20061029T020000
-RDATE:20061029T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vincennes.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vincennes.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vincennes.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,149 +1,150 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Indiana/Vincennes
 X-LIC-LOCATION:America/Indiana/Vincennes
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:18831118T120953
+RDATE:18831118T120953
+TZNAME:CST
+TZOFFSETFROM:-055007
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:CDT
-DTSTART:19530426T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T080000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19530927T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19560429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19630428T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19631027T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20080309T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20081102T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-055007
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T120953
-RDATE:18831118T120953
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19450930T020000
 RDATE:19450930T020000
 RDATE:19460929T020000
 RDATE:19601030T020000
 RDATE:19610924T020000
 RDATE:20061029T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:CST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19460101T000000
-RDATE:19460101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
 DTSTART:19460428T020000
 RDATE:19460428T020000
 RDATE:19550501T000000
 RDATE:20070311T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19530426T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19530927T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;UNTIL=19630428T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19631027T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19640426T020000
 RDATE:19640426T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19690101T000000
 RDATE:19690101T000000
 RDATE:19710101T000000
 RDATE:20071104T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19700426T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19701025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CDT
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20060402T020000
 RDATE:20060402T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20080309T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20081102T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Winamac.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Winamac.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Winamac.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,143 +1,144 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Indiana/Winamac
 X-LIC-LOCATION:America/Indiana/Winamac
+BEGIN:STANDARD
+DTSTART:18831118T121335
+RDATE:18831118T121335
+TZNAME:CST
+TZOFFSETFROM:-054625
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T080000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:20061029T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
 TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19600424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19561028T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19561028T070000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19600925T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19570929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T070000Z
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19610430T020000
+RDATE:19610430T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19690101T000000
+RDATE:19690101T000000
+RDATE:19710101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19700426T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20080309T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-054625
-TZOFFSETTO:-0600
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19701025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20060402T020000
+RDATE:20060402T020000
 TZNAME:CST
-DTSTART:18831118T121335
-RDATE:18831118T121335
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:20061029T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20070311T020000
+RDATE:20070311T020000
+TZNAME:EST
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19460101T000000
-RDATE:19460101T000000
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:EST
-DTSTART:19610430T020000
-RDATE:19610430T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19690101T000000
-RDATE:19690101T000000
-RDATE:19710101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20080309T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20060402T020000
-RDATE:20060402T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RDATE:20070311T020000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indianapolis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indianapolis.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indianapolis.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,141 +1,142 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Indianapolis
 X-LIC-LOCATION:America/Indianapolis
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:18831118T121522
+RDATE:18831118T121522
+TZNAME:CST
+TZOFFSETFROM:-054438
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054438
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121522
-RDATE:18831118T121522
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19200101T000000
 RDATE:19200101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19410622T020000
+RDATE:19410622T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19410622T020000
-RDATE:19410622T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19410928T020000
 RDATE:19410928T020000
 RDATE:19450930T020000
 RDATE:19570929T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19550424T020000
 RDATE:19550424T020000
 RDATE:19580427T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19690101T000000
 RDATE:19690101T000000
 RDATE:19710101T000000
 RDATE:20060101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19700426T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19701025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:20060402T020000
 RDATE:20060402T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20061029T020000
+RDATE:20061029T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:EST
-DTSTART:20061029T020000
-RDATE:20061029T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Inuvik.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Inuvik.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Inuvik.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,77 +1,79 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Inuvik
 X-LIC-LOCATION:America/Inuvik
+BEGIN:STANDARD
+DTSTART:19530101T000000
+RDATE:19530101T000000
+TZNAME:PST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0800
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:PDDT
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:PST
 TZOFFSETFROM:-0600
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790429T020000
+RDATE:19790429T020000
+TZNAME:MST
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800101T000000
+RDATE:19800101T000000
 TZNAME:MST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19530101T000000
-RDATE:19530101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:PDDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19651031T020000
-RDATE:19651031T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-DTSTART:19790429T020000
-RDATE:19790429T020000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19800101T000000
-RDATE:19800101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Iqaluit.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Iqaluit.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Iqaluit.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,113 +1,114 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Iqaluit
 X-LIC-LOCATION:America/Iqaluit
+BEGIN:STANDARD
+DTSTART:19420801T000000
+RDATE:19420801T000000
+TZNAME:EST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0400
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19981025T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:EDDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19990404T070000Z
+TZOFFSETTO:-0300
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:EST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20010401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19981025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19990404T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19991031T020000
+RDATE:19991031T020000
+TZNAME:CST
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000402T020000
+RDATE:20000402T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001029T020000
+RDATE:20001029T020000
 TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
+DTSTART:20010401T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420801T000000
-RDATE:19420801T000000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0300
-TZNAME:EDDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0500
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:EST
-DTSTART:19651031T020000
-RDATE:19651031T020000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0400
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19991031T020000
-RDATE:19991031T020000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20000402T020000
-RDATE:20000402T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20001029T020000
-RDATE:20001029T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jamaica.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jamaica.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jamaica.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Jamaica
 X-LIC-LOCATION:America/Jamaica
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19831030T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KMT
 TZOFFSETFROM:-050712
 TZOFFSETTO:-050712
-TZNAME:KMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120201T000000
+RDATE:19120201T000000
+TZNAME:EST
 TZOFFSETFROM:-050712
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740428T020000
+RDATE:19740428T020000
 TZNAME:EST
-DTSTART:19120201T000000
-RDATE:19120201T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=19831030T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19750223T020000
+RDATE:19750223T020000
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:19740428T020000
-RDATE:19740428T020000
-RDATE:19750223T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19840101T000000
+RDATE:19840101T000000
+TZNAME:EST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19840101T000000
-RDATE:19840101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jujuy.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jujuy.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jujuy.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,173 +1,174 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Jujuy
 X-LIC-LOCATION:America/Jujuy
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042112
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
+BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-042112
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
-END:STANDARD
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19691005T000000
-RDATE:19691005T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19891015T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:19890305T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19900304T000000
+RDATE:19900304T000000
+TZNAME:WART
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19900304T000000
-RDATE:19900304T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19901028T000000
+RDATE:19901028T000000
+TZNAME:WARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:WARST
-DTSTART:19901028T000000
-RDATE:19901028T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910317T000000
+RDATE:19910317T000000
+TZNAME:WART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19910317T000000
-RDATE:19910317T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911006T000000
+RDATE:19911006T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
 TZNAME:ARST
-DTSTART:19911006T000000
-RDATE:19911006T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+RDATE:20000303T000000
 TZNAME:ARST
-DTSTART:19920101T000000
-RDATE:19920101T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19991003T000000
-RDATE:19991003T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:20081018T000000
+RDATE:20081018T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:20000303T000000
-RDATE:20000303T000000
-RDATE:20081018T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Juneau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Juneau.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Juneau.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,130 +1,124 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Juneau
 X-LIC-LOCATION:America/Juneau
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T100000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
+DTSTART:19000820T120000
+RDATE:19000820T120000
 TZNAME:PST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T090000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T100000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19840429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:19841028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+150219
-TZOFFSETTO:-085741
-TZNAME:LMT
-DTSTART:18671018T000000
-RDATE:18671018T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-085741
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19000820T120000
-RDATE:19000820T120000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-TZNAME:PST
 DTSTART:19420101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
 RDATE:19690101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PWT
 DTSTART:19420209T020000
 RDATE:19420209T020000
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:PPT
 DTSTART:19450814T160000
 RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
 DTSTART:19450930T020000
 RDATE:19450930T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19821031T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19740106T020000
 RDATE:19740106T020000
 RDATE:19750223T020000
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0900
-TZNAME:YST
 DTSTART:19831030T020000
 RDATE:19831030T020000
+TZNAME:YST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0900
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19831130T000000
+RDATE:19831130T000000
+TZNAME:AKST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T110000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T100000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:AKST
-DTSTART:19831130T000000
-RDATE:19831130T000000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T110000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AKST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Louisville.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Louisville.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Louisville.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,172 +1,185 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Kentucky/Louisville
 X-LIC-LOCATION:America/Kentucky/Louisville
+BEGIN:STANDARD
+DTSTART:18831118T121658
+RDATE:18831118T121658
+TZNAME:CST
+TZOFFSETFROM:-054302
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19210101T000000
+RDATE:19210101T000000
+RDATE:19420101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19210501T020000
+RDATE:19210501T020000
+RDATE:19410427T020000
+RDATE:19470427T020000
 TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19210901T020000
+RDATE:19210901T020000
+RDATE:19410928T020000
+RDATE:19450930T020000
+RDATE:19460602T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
 TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RDATE:19460428T020000
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19480425T020000
+RRULE:FREQ=YEARLY;UNTIL=19500430T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19480425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19500430T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19500924T020000
+RRULE:FREQ=YEARLY;UNTIL=19550925T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19500924T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19550925T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19610430T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19610430T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19561028T020000
+RRULE:FREQ=YEARLY;UNTIL=19601030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19561028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19601030T070000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19610723T020000
+RDATE:19610723T020000
+RDATE:19680101T000000
+RDATE:19741027T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19680428T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19680428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19681027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19731028T060000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19740106T020000
+RDATE:19740106T020000
+TZNAME:CDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19750223T020000
+RDATE:19750223T020000
 TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054302
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121658
-RDATE:18831118T121658
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19210101T000000
-RDATE:19210101T000000
-RDATE:19420101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19210501T020000
-RDATE:19210501T020000
-RDATE:19410427T020000
-RDATE:19460101T000000
-RDATE:19470427T020000
-END:DAYLIGHT
-BEGIN:STANDARD
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19210901T020000
-RDATE:19210901T020000
-RDATE:19410928T020000
-RDATE:19450930T020000
-RDATE:19460602T020000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RDATE:19460428T020000
-RDATE:19740106T020000
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19610723T020000
-RDATE:19610723T020000
-RDATE:19680101T000000
-RDATE:19741027T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19750223T020000
-RDATE:19750223T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Monticello.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Monticello.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Monticello.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,129 +1,130 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Kentucky/Monticello
 X-LIC-LOCATION:America/Kentucky/Monticello
+BEGIN:STANDARD
+DTSTART:18831118T122036
+RDATE:18831118T122036
+TZNAME:CST
+TZOFFSETFROM:-053924
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19680428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+RDATE:19680101T000000
 TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19680428T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19681027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991031T070000Z
+RRULE:FREQ=YEARLY;UNTIL=19991031T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20010401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:20001029T020000
+RDATE:20001029T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010401T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-053924
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T122036
-RDATE:18831118T122036
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19460101T000000
-RDATE:19460101T000000
-RDATE:19680101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20001029T020000
-RDATE:20001029T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Knox_IN.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Knox_IN.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Knox_IN.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,165 +1,166 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Knox_IN
 X-LIC-LOCATION:America/Knox_IN
+BEGIN:STANDARD
+DTSTART:18831118T121330
+RDATE:18831118T121330
+TZNAME:CST
+TZOFFSETFROM:-054630
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19610430T080000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19631027T020000
+RDATE:20061029T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19470101T000000
+RDATE:19470101T000000
 TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19610430T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19561028T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19561028T070000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19570929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T070000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19591025T020000
+RRULE:FREQ=YEARLY;UNTIL=19611029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19591025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19611029T070000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19620429T020000
+RDATE:19620429T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19670430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19901028T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901028T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19910407T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19910407T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19911027T020000
+RDATE:19911027T020000
+TZNAME:EST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-054630
-TZOFFSETTO:-0600
+DTSTART:20060402T020000
+RDATE:20060402T020000
 TZNAME:CST
-DTSTART:18831118T121330
-RDATE:18831118T121330
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:19631027T020000
-RDATE:20061029T020000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19470101T000000
-RDATE:19470101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19620429T020000
-RDATE:19620429T020000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19911027T020000
-RDATE:19911027T020000
+TZOFFSETTO:-0600
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20060402T020000
-RDATE:20060402T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/La_Paz.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/La_Paz.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/La_Paz.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/La_Paz
 X-LIC-LOCATION:America/La_Paz
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
 TZOFFSETFROM:-043236
 TZOFFSETTO:-043236
-TZNAME:CMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19311015T000000
+RDATE:19311015T000000
+TZNAME:BOST
 TZOFFSETFROM:-043236
 TZOFFSETTO:-033236
-TZNAME:BOST
-DTSTART:19311015T000000
-RDATE:19311015T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19320321T000000
+RDATE:19320321T000000
+TZNAME:BOT
 TZOFFSETFROM:-033236
 TZOFFSETTO:-0400
-TZNAME:BOT
-DTSTART:19320321T000000
-RDATE:19320321T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lima.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lima.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lima.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,68 +1,63 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Lima
 X-LIC-LOCATION:America/Lima
+BEGIN:STANDARD
+DTSTART:19080728T000000
+RDATE:19080728T000000
+TZNAME:PEST
+TZOFFSETFROM:-050836
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19380101T000000
+RDATE:19380101T000000
+RDATE:19900101T000000
+RDATE:19940101T000000
+TZNAME:PEST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:PEST
-DTSTART:19380925T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19390924T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19380401T000000
+RDATE:19380401T000000
+RDATE:19900401T000000
+RDATE:19940401T000000
+TZNAME:PET
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:PET
-DTSTART:19390326T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=24,25,26,27,28,29,30;BYDAY=SU;UNTIL=19400324T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19380925T000000
+RRULE:FREQ=YEARLY;UNTIL=19390924T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PEST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:PEST
-DTSTART:19860101T000000
-RRULE:FREQ=YEARLY;UNTIL=19870101T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19390326T000000
+RRULE:FREQ=YEARLY;UNTIL=19400324T040000Z;BYDAY=SU;BYMONTHDAY=24,25,26,27,2
+ 8,29,30;BYMONTH=3
+TZNAME:PET
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:PET
-DTSTART:19860401T000000
-RRULE:FREQ=YEARLY;UNTIL=19870401T040000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-050812
-TZOFFSETTO:-050836
-TZNAME:LMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-050836
-TZOFFSETTO:-0500
-TZNAME:PET
-DTSTART:19080728T000000
-RDATE:19080728T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19860101T000000
+RRULE:FREQ=YEARLY;UNTIL=19870101T050000Z;BYMONTH=1
+TZNAME:PEST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:PEST
-DTSTART:19380101T000000
-RDATE:19380101T000000
-RDATE:19900101T000000
-RDATE:19940101T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19860401T000000
+RRULE:FREQ=YEARLY;UNTIL=19870401T040000Z;BYMONTH=4
+TZNAME:PET
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:PET
-DTSTART:19380401T000000
-RDATE:19380401T000000
-RDATE:19900401T000000
-RDATE:19940401T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Los_Angeles.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Los_Angeles.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Los_Angeles.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,117 +1,132 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Los_Angeles
 X-LIC-LOCATION:America/Los_Angeles
+BEGIN:STANDARD
+DTSTART:18831118T120702
+RDATE:18831118T120702
+TZNAME:PST
+TZOFFSETFROM:-075258
+TZOFFSETTO:-0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T100000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:PWT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19500430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T100000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19490101T020000
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19500924T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T090000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
+DTSTART:19460101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19480314T020000
+RDATE:19480314T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
+DTSTART:19500430T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T100000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19500924T020000
+RRULE:FREQ=YEARLY;UNTIL=19610924T090000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-075258
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:18831118T120702
-RDATE:18831118T120702
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:PPT
-DTSTART:19450814T160000
-RDATE:19450814T160000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:19490101T020000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19460101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
-END:STANDARD
+TZOFFSETTO:-0700
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZNAME:PDT
-DTSTART:19480314T020000
-RDATE:19480314T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Louisville.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Louisville.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Louisville.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,172 +1,185 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Louisville
 X-LIC-LOCATION:America/Louisville
+BEGIN:STANDARD
+DTSTART:18831118T121658
+RDATE:18831118T121658
+TZNAME:CST
+TZOFFSETFROM:-054302
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19210101T000000
+RDATE:19210101T000000
+RDATE:19420101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19210501T020000
+RDATE:19210501T020000
+RDATE:19410427T020000
+RDATE:19470427T020000
 TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19210901T020000
+RDATE:19210901T020000
+RDATE:19410928T020000
+RDATE:19450930T020000
+RDATE:19460602T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
 TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RDATE:19460428T020000
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19480425T020000
+RRULE:FREQ=YEARLY;UNTIL=19500430T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19480425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19500430T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19500924T020000
+RRULE:FREQ=YEARLY;UNTIL=19550925T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19500924T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19550925T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19610430T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19610430T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19561028T020000
+RRULE:FREQ=YEARLY;UNTIL=19601030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19561028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19601030T070000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19610723T020000
+RDATE:19610723T020000
+RDATE:19680101T000000
+RDATE:19741027T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19680428T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19680428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19681027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19731028T060000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19740106T020000
+RDATE:19740106T020000
+TZNAME:CDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19750223T020000
+RDATE:19750223T020000
 TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054302
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121658
-RDATE:18831118T121658
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19210101T000000
-RDATE:19210101T000000
-RDATE:19420101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19210501T020000
-RDATE:19210501T020000
-RDATE:19410427T020000
-RDATE:19460101T000000
-RDATE:19470427T020000
-END:DAYLIGHT
-BEGIN:STANDARD
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19210901T020000
-RDATE:19210901T020000
-RDATE:19410928T020000
-RDATE:19450930T020000
-RDATE:19460602T020000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RDATE:19460428T020000
-RDATE:19740106T020000
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19610723T020000
-RDATE:19610723T020000
-RDATE:19680101T000000
-RDATE:19741027T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19750223T020000
-RDATE:19750223T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Maceio.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Maceio.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Maceio.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,69 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Maceio
 X-LIC-LOCATION:America/Maceio
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19140101T000000
+RDATE:19140101T000000
 TZNAME:BRST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:-022252
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19140101T000000
-RDATE:19140101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
 DTSTART:19311003T110000
 RDATE:19311003T110000
 RDATE:19321003T000000
@@ -71,15 +20,33 @@
 RDATE:19650131T000000
 RDATE:19651201T000000
 RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
 RDATE:19881016T000000
 RDATE:19891015T000000
 RDATE:19951015T000000
 RDATE:19991003T000000
+RDATE:20001008T000000
+RDATE:20011014T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z;BYMONTH=12
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -94,18 +61,48 @@
 RDATE:20000227T000000
 RDATE:20001022T000000
 RDATE:20020217T000000
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z;BYMONTH=4
+TZNAME:BRT
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z;BYMONTH=3
 TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z;BYMONTH=11
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900917T000000
 RDATE:19900917T000000
-RDATE:19951013T000000
 RDATE:19960904T000000
+RDATE:20021001T000000
+TZNAME:BRT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19951013T000000
+RDATE:19951013T000000
 RDATE:19990930T000000
 RDATE:20010913T000000
-RDATE:20021001T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Managua.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Managua.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Managua.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,67 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Managua
 X-LIC-LOCATION:America/Managua
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19790318T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T060000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19790625T000000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=MO;UNTIL=19800623T050000Z
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:MMT
 TZOFFSETFROM:-054508
 TZOFFSETTO:-054512
-TZNAME:MMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19340623T000000
+RDATE:19340623T000000
+TZNAME:CST
 TZOFFSETFROM:-054512
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19340623T000000
-RDATE:19340623T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19730501T000000
 RDATE:19730501T000000
 RDATE:19920101T040000
 RDATE:19930101T000000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19750216T000000
 RDATE:19750216T000000
 RDATE:19920924T000000
 RDATE:19970101T000000
 RDATE:20051002T000000
 RDATE:20061001T010000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790318T000000
+RRULE:FREQ=YEARLY;UNTIL=19800316T060000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790625T000000
+RRULE:FREQ=YEARLY;UNTIL=19800623T050000Z;BYDAY=MO;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=6
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:20050410T000000
 RDATE:20050410T000000
 RDATE:20060430T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Manaus.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Manaus.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Manaus.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,75 +1,47 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Manaus
 X-LIC-LOCATION:America/Manaus
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-040004
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+RDATE:19931017T000000
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
 TZNAME:AMT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z;BYMONTH=12
 TZNAME:AMST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-040004
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-RDATE:19931017T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AMT
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -79,15 +51,45 @@
 RDATE:19870214T000000
 RDATE:19880207T000000
 RDATE:19940220T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z;BYMONTH=3
 TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z;BYMONTH=11
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
-RDATE:19930928T000000
 RDATE:19940922T000000
+TZNAME:AMT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19930928T000000
+RDATE:19930928T000000
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Marigot.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Marigot.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Marigot.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Marigot
 X-LIC-LOCATION:America/Marigot
 BEGIN:STANDARD
+DTSTART:19110608T000000
+RDATE:19110608T000000
+TZNAME:AST
 TZOFFSETFROM:-040608
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110608T000000
-RDATE:19110608T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Martinique.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Martinique.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Martinique.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Martinique
 X-LIC-LOCATION:America/Martinique
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:FFMT
 TZOFFSETFROM:-040420
 TZOFFSETTO:-040420
-TZNAME:FFMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110501T000000
+RDATE:19110501T000000
+TZNAME:AST
 TZOFFSETFROM:-040420
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110501T000000
-RDATE:19110501T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19800406T000000
+RDATE:19800406T000000
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19800406T000000
-RDATE:19800406T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19800928T000000
+RDATE:19800928T000000
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19800928T000000
-RDATE:19800928T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Matamoros.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Matamoros.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Matamoros.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,83 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:America/Matamoros
+X-LIC-LOCATION:America/Matamoros
+BEGIN:STANDARD
+DTSTART:19211231T232000
+RDATE:19211231T232000
+TZNAME:CST
+TZOFFSETFROM:-0640
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19880101T000000
+RDATE:19880101T000000
+RDATE:19890101T000000
+RDATE:20100101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19880403T020000
+RDATE:19880403T020000
+RDATE:20010506T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19881030T020000
+RDATE:19881030T020000
+RDATE:20010930T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20090405T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;UNTIL=20091025T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20101107T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mazatlan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mazatlan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mazatlan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,83 +1,84 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Mazatlan
 X-LIC-LOCATION:America/Mazatlan
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T090000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
+DTSTART:19211231T235420
+RDATE:19211231T235420
 TZNAME:MST
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T080000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20021027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-070540
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19211231T235420
-RDATE:19211231T235420
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19270610T230000
 RDATE:19270610T230000
 RDATE:19310501T230000
 RDATE:19320401T000000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
 DTSTART:19301115T000000
 RDATE:19301115T000000
 RDATE:19311001T000000
 RDATE:19420424T000000
 RDATE:20010930T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19490114T000000
+RDATE:19490114T000000
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19490114T000000
-RDATE:19490114T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19700101T000000
+RDATE:19700101T000000
+TZNAME:MST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19700101T000000
-RDATE:19700101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:20010506T020000
 RDATE:20010506T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mendoza.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mendoza.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mendoza.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,167 +1,164 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Mendoza
 X-LIC-LOCATION:America/Mendoza
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043516
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
 TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:WARST
-DTSTART:19901015T000000
-RRULE:FREQ=YEARLY;UNTIL=19911015T040000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19910301T000000
-RRULE:FREQ=YEARLY;UNTIL=19920301T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-043516
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
 RDATE:20040926T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19891015T000000
 RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
 RDATE:19890305T000000
 RDATE:19930307T000000
 RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
 DTSTART:19900304T000000
 RDATE:19900304T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19901015T000000
+RDATE:19901015T000000
+RDATE:19911015T000000
+TZNAME:WARST
 TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-TZNAME:ARST
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910301T000000
+RDATE:19910301T000000
+RDATE:19920301T000000
+RDATE:20040523T000000
+TZNAME:WART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19921018T000000
 RDATE:19921018T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
 TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:ART
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20000303T000000
 RDATE:20000303T000000
 RDATE:20081018T000000
-END:STANDARD
-BEGIN:STANDARD
+TZNAME:ART
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:20040523T000000
-RDATE:20040523T000000
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Menominee.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Menominee.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Menominee.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,118 +1,119 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Menominee
 X-LIC-LOCATION:America/Menominee
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:18850918T120000
+RDATE:18850918T120000
 TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
+TZOFFSETFROM:-055027
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19731028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:CDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-055027
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18850918T120000
-RDATE:18850918T120000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19450930T020000
 RDATE:19450930T020000
 RDATE:19460929T020000
 RDATE:19661030T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:CST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19460101T000000
-RDATE:19460101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
 DTSTART:19460428T020000
 RDATE:19460428T020000
 RDATE:19660424T020000
 RDATE:19740106T020000
 RDATE:19750223T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19690427T020000
+RDATE:19690427T020000
+TZNAME:EST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19690427T020000
-RDATE:19690427T020000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730429T020000
+RDATE:19730429T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19731028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19730429T020000
-RDATE:19730429T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Merida.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Merida.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Merida.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,65 +1,66 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Merida
 X-LIC-LOCATION:America/Merida
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19220101T000132
+RDATE:19220101T000132
+TZNAME:CST
+TZOFFSETFROM:-055828
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19811223T000000
+RDATE:19811223T000000
+TZNAME:EST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19821202T000000
+RDATE:19821202T000000
+RDATE:20010930T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20021027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-055828
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19220101T000132
-RDATE:19220101T000132
-END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010506T020000
+RDATE:20010506T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19811223T000000
-RDATE:19811223T000000
-END:STANDARD
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19821202T000000
-RDATE:19821202T000000
-RDATE:20010930T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20010506T020000
-RDATE:20010506T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mexico_City.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mexico_City.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mexico_City.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,95 +1,96 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Mexico_City
 X-LIC-LOCATION:America/Mexico_City
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20021027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19220101T002324
+RDATE:19220101T002324
+TZNAME:MST
 TZOFFSETFROM:-063636
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19220101T002324
-RDATE:19220101T002324
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19270610T230000
 RDATE:19270610T230000
 RDATE:19310501T230000
 RDATE:19320401T000000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
 DTSTART:19301115T000000
 RDATE:19301115T000000
 RDATE:19311001T000000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
 DTSTART:19390205T000000
 RDATE:19390205T000000
 RDATE:19401209T000000
 RDATE:19500212T000000
 RDATE:20010506T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19390625T000000
 RDATE:19390625T000000
 RDATE:19410401T000000
 RDATE:19440501T000000
 RDATE:19500730T000000
 RDATE:20010930T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19431216T000000
+RDATE:19431216T000000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19431216T000000
-RDATE:19431216T000000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20020220T000000
 RDATE:20020220T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Miquelon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Miquelon.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Miquelon.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Miquelon
 X-LIC-LOCATION:America/Miquelon
+BEGIN:STANDARD
+DTSTART:19110515T000000
+RDATE:19110515T000000
+TZNAME:AST
+TZOFFSETFROM:-034440
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800501T000000
+RDATE:19800501T000000
+TZNAME:PMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870101T000000
+RDATE:19870101T000000
+TZNAME:PMST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T050000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PMDT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:PMDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PMST
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:PMST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PMDT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:PMDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:PMST
 DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-034440
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110515T000000
-RDATE:19110515T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:PMST
-DTSTART:19800501T000000
-RDATE:19800501T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:PMST
-DTSTART:19870101T000000
-RDATE:19870101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Moncton.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Moncton.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Moncton.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,171 +1,173 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Moncton
 X-LIC-LOCATION:America/Moncton
+BEGIN:STANDARD
+DTSTART:18831209T000000
+RDATE:18831209T000000
+TZNAME:EST
+TZOFFSETFROM:-041908
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19020615T000000
+RDATE:19020615T000000
+TZNAME:AST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19390527T010000
+RDATE:19400519T010000
+RDATE:19410504T010000
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19330611T010000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=2SU;UNTIL=19350609T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19730101T000000
+RDATE:19930101T000000
+RDATE:20070101T000000
 TZNAME:AST
-DTSTART:19330910T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=2SU;UNTIL=19350908T040000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19330611T010000
+RRULE:FREQ=YEARLY;UNTIL=19350609T050000Z;BYDAY=2SU;BYMONTH=6
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19360607T010000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19380605T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19330910T010000
+RRULE:FREQ=YEARLY;UNTIL=19350908T040000Z;BYDAY=2SU;BYMONTH=9
 TZNAME:AST
-DTSTART:19360906T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=19380904T040000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19390923T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SA;UNTIL=19410927T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19360607T010000
+RRULE:FREQ=YEARLY;UNTIL=19380605T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19720430T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19360906T010000
+RRULE:FREQ=YEARLY;UNTIL=19380904T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19560930T050000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19390923T010000
+RRULE:FREQ=YEARLY;UNTIL=19410927T040000Z;BYDAY=SA;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19571027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19721029T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19740428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19921025T050000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19920405T060000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19720430T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19930404T000100
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T040100Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19560930T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19571027T020000
+RRULE:FREQ=YEARLY;UNTIL=19721029T050000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:AST
-DTSTART:19931031T000100
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T030100Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=19921025T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041908
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:18831209T000000
-RDATE:18831209T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19020615T000000
-RDATE:19020615T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19920405T060000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19930404T000100
+RRULE:FREQ=YEARLY;UNTIL=20060402T040100Z;BYDAY=1SU;BYMONTH=4
 TZNAME:ADT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19390527T010000
-RDATE:19400519T010000
-RDATE:19410504T010000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19931031T000100
+RRULE:FREQ=YEARLY;UNTIL=20061029T030100Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19330101T000000
-RDATE:19330101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19730101T000000
-RDATE:19930101T000000
-RDATE:20070101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-TZNAME:APT
-DTSTART:19450814T200000
-RDATE:19450814T200000
-END:DAYLIGHT
+TZOFFSETTO:-0400
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Monterrey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Monterrey.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Monterrey.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,66 +1,68 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Monterrey
 X-LIC-LOCATION:America/Monterrey
 BEGIN:STANDARD
+DTSTART:19211231T231844
+RDATE:19211231T231844
+TZNAME:CST
+TZOFFSETFROM:-064116
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19880101T000000
+RDATE:19880101T000000
+RDATE:19890101T000000
+TZNAME:CST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19880101T000000
-RRULE:FREQ=YEARLY;UNTIL=19890101T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19880403T020000
+RDATE:19880403T020000
+RDATE:20010506T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19881030T020000
+RDATE:19881030T020000
+RDATE:20010930T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20021027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-064116
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19211231T231844
-RDATE:19211231T231844
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19880403T020000
-RDATE:19880403T020000
-RDATE:20010506T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19881030T020000
-RDATE:19881030T020000
-RDATE:20010930T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montevideo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montevideo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montevideo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,149 +1,91 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Montevideo
 X-LIC-LOCATION:America/Montevideo
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:18980628T000000
+RDATE:18980628T000000
+TZNAME:MMT
+TZOFFSETFROM:-034444
+TZOFFSETTO:-034444
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:UYST
+TZOFFSETFROM:-034444
 TZOFFSETTO:-0330
-TZNAME:UYT
-DTSTART:19240401T000000
-RRULE:FREQ=YEARLY;UNTIL=19260401T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0300
+DTSTART:19231002T000000
+RDATE:19231002T000000
+RDATE:19361101T000000
+RDATE:19410801T000000
 TZNAME:UYHST
-DTSTART:19241001T000000
-RRULE:FREQ=YEARLY;UNTIL=19251001T033000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0300
-TZNAME:UYHST
-DTSTART:19331029T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19351027T033000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0330
+DTSTART:19240401T000000
+RRULE:FREQ=YEARLY;UNTIL=19260401T030000Z;BYMONTH=4
 TZNAME:UYT
-DTSTART:19340401T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=SU;UNTIL=19360329T030000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=SU;UNTIL=19360329T030000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0330
-TZNAME:UYT
-DTSTART:19370328T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19410330T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19241001T000000
+RRULE:FREQ=YEARLY;UNTIL=19251001T033000Z;BYMONTH=10
+TZNAME:UYHST
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0300
-TZNAME:UYHST
-DTSTART:19371031T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19401027T033000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:UYST
-DTSTART:19650404T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19670402T030000Z
+DTSTART:19331029T000000
+RRULE:FREQ=YEARLY;UNTIL=19351027T033000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:UYHST
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19340401T000000
+RRULE:FREQ=YEARLY;UNTIL=19360329T030000Z;BYDAY=SU;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=3
 TZNAME:UYT
-DTSTART:19661031T000000
-RRULE:FREQ=YEARLY;UNTIL=19671031T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0230
-TZNAME:UYHST
-DTSTART:19680527T000000
-RRULE:FREQ=YEARLY;UNTIL=19700527T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0300
-TZNAME:UYT
-DTSTART:19681202T000000
-RRULE:FREQ=YEARLY;UNTIL=19701202T023000Z
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19370328T000000
+RRULE:FREQ=YEARLY;UNTIL=19410330T030000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:UYT
-DTSTART:19900304T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19920301T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:UYST
-DTSTART:19901021T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19911027T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:UYST
-DTSTART:20061001T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:UYT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-034444
-TZOFFSETTO:-034444
-TZNAME:MMT
-DTSTART:18980628T000000
-RDATE:18980628T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-034444
 TZOFFSETTO:-0330
-TZNAME:UYT
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19371031T000000
+RRULE:FREQ=YEARLY;UNTIL=19401027T033000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:UYHST
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0300
-TZNAME:UYHST
-DTSTART:19231002T000000
-RDATE:19231002T000000
-RDATE:19361101T000000
-RDATE:19410801T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+TZNAME:UYT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0330
-TZNAME:UYT
-DTSTART:19420101T000000
-RDATE:19420101T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19421214T000000
+RDATE:19421214T000000
+TZNAME:UYST
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0200
-TZNAME:UYST
-DTSTART:19421214T000000
-RDATE:19421214T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:UYT
 DTSTART:19430314T000000
 RDATE:19430314T000000
 RDATE:19591115T000000
@@ -158,11 +100,11 @@
 RDATE:19930228T000000
 RDATE:20050327T020000
 RDATE:20060312T020000
+TZNAME:UYT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:UYST
 DTSTART:19590524T000000
 RDATE:19590524T000000
 RDATE:19600117T000000
@@ -175,20 +117,80 @@
 RDATE:19921018T000000
 RDATE:20040919T000000
 RDATE:20051009T020000
+TZNAME:UYST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19650404T000000
+RRULE:FREQ=YEARLY;UNTIL=19670402T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:UYST
 TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19661031T000000
+RRULE:FREQ=YEARLY;UNTIL=19671031T020000Z;BYMONTH=10
+TZNAME:UYT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19680527T000000
+RRULE:FREQ=YEARLY;UNTIL=19700527T030000Z;BYMONTH=5
+TZNAME:UYHST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0230
-TZNAME:UYHST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681202T000000
+RRULE:FREQ=YEARLY;UNTIL=19701202T023000Z;BYMONTH=12
+TZNAME:UYT
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19740310T000000
 RDATE:19740310T000000
+TZNAME:UYHST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0230
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19741222T000000
+RDATE:19741222T000000
+TZNAME:UYST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900304T000000
+RRULE:FREQ=YEARLY;UNTIL=19920301T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:UYT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19901021T000000
+RRULE:FREQ=YEARLY;UNTIL=19911027T030000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
 TZNAME:UYST
-DTSTART:19741222T000000
-RDATE:19741222T000000
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20061001T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:UYST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:UYT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montreal.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montreal.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montreal.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,175 +1,185 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Montreal
 X-LIC-LOCATION:America/Montreal
 BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:EST
+TZOFFSETFROM:-045416
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19180414T020000
+RDATE:19190331T023000
+RDATE:19200502T023000
+RDATE:19210501T020000
+RDATE:19220430T020000
+RDATE:19240517T020000
+RDATE:19270501T000000
+RDATE:19320501T000000
+TZNAME:EDT
 TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170424T000000
+RDATE:19170424T000000
+RDATE:19181031T020000
+RDATE:19191025T023000
+RDATE:19331001T000000
+RDATE:19450930T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+RDATE:19190101T000000
+RDATE:19460101T000000
+RDATE:19740101T000000
 TZNAME:EST
-DTSTART:19180101T000000
-RRULE:FREQ=YEARLY;UNTIL=19190101T050000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19201003T023000
+RRULE:FREQ=YEARLY;UNTIL=19221001T063000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19201003T023000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19221001T063000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19240928T023000
+RRULE:FREQ=YEARLY;UNTIL=19260926T063000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19240928T023000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19260926T063000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250503T020000
+RRULE:FREQ=YEARLY;UNTIL=19260502T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19250503T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19260502T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19270925T000000
+RRULE:FREQ=YEARLY;UNTIL=19320925T040000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19270925T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19320925T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280429T000000
+RRULE:FREQ=YEARLY;UNTIL=19310426T050000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19280429T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19310426T050000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19330430T000000
+RRULE:FREQ=YEARLY;UNTIL=19400428T050000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19330430T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19400428T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19340930T000000
+RRULE:FREQ=YEARLY;UNTIL=19390924T040000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19340930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19390924T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T030000
+RDATE:19420209T030000
+TZNAME:EWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19480926T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19480926T060000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19491030T020000
+RRULE:FREQ=YEARLY;UNTIL=19501029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19491030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19501029T060000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19560930T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19560930T060000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19571027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19571027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-045416
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZNAME:EDT
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19180414T020000
-RDATE:19190331T023000
-RDATE:19200502T023000
-RDATE:19210501T020000
-RDATE:19220430T020000
-RDATE:19240517T020000
-RDATE:19270501T000000
-RDATE:19320501T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:EST
-DTSTART:19170424T000000
-RDATE:19170424T000000
-RDATE:19181031T020000
-RDATE:19191025T023000
-RDATE:19331001T000000
-RDATE:19450930T020000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19460101T000000
-RDATE:19460101T000000
-RDATE:19740101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montserrat.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montserrat.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montserrat.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Montserrat
 X-LIC-LOCATION:America/Montserrat
 BEGIN:STANDARD
+DTSTART:19110701T000100
+RDATE:19110701T000100
+TZNAME:AST
 TZOFFSETFROM:-040852
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110701T000100
-RDATE:19110701T000100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nassau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nassau.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nassau.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Nassau
 X-LIC-LOCATION:America/Nassau
+BEGIN:STANDARD
+DTSTART:19120302T000000
+RDATE:19120302T000000
+TZNAME:EST
+TZOFFSETFROM:-050924
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19640426T020000
+RRULE:FREQ=YEARLY;UNTIL=19750427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19640426T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19641025T020000
+RRULE:FREQ=YEARLY;UNTIL=19751026T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19760101T000000
+RDATE:19760101T000000
 TZNAME:EST
-DTSTART:19641025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19761031T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-050924
-TZOFFSETTO:-0500
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:EST
-DTSTART:19120302T000000
-RDATE:19120302T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19760101T000000
-RDATE:19760101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/New_York.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/New_York.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/New_York.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,131 +1,148 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/New_York
 X-LIC-LOCATION:America/New_York
+BEGIN:STANDARD
+DTSTART:18831118T120358
+RDATE:18831118T120358
+TZNAME:EST
+TZOFFSETFROM:-045602
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T070000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19200328T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
 TZNAME:EST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T060000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200328T020000
+RDATE:19200328T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19210424T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19450930T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19210424T020000
+RRULE:FREQ=YEARLY;UNTIL=19410427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;UNTIL=19410928T060000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:EST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T060000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:EWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-045602
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:18831118T120358
-RDATE:18831118T120358
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nipigon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nipigon.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nipigon.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,80 +1,87 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Nipigon
 X-LIC-LOCATION:America/Nipigon
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:EST
+TZOFFSETFROM:-055304
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19740428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400929T000000
+RDATE:19400929T000000
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T030000
+RDATE:19420209T030000
+TZNAME:EWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-055304
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:18950101T000000
-RDATE:18950101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZNAME:EDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19400929T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nome.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nome.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nome.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,137 +1,131 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Nome
 X-LIC-LOCATION:America/Nome
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:BDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T130000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-TZNAME:BST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T120000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:BDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T130000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19840429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:19841028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+125821
-TZOFFSETTO:-110138
-TZNAME:LMT
-DTSTART:18671018T000000
-RDATE:18671018T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-110138
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19000820T120000
 RDATE:19000820T120000
+TZNAME:NST
+TZOFFSETFROM:-110138
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19420101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
+TZNAME:NST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:NWT
 DTSTART:19420209T020000
 RDATE:19420209T020000
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-TZNAME:NPT
 DTSTART:19450814T130000
 RDATE:19450814T130000
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19450930T020000
 RDATE:19450930T020000
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:BST
 DTSTART:19670401T000000
 RDATE:19670401T000000
 RDATE:19690101T000000
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T130000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:BDT
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1000
-TZNAME:BDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19821031T120000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:BST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19740106T020000
 RDATE:19740106T020000
 RDATE:19750223T020000
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T130000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:YST
 DTSTART:19831030T020000
 RDATE:19831030T020000
+TZNAME:YST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19831130T000000
+RDATE:19831130T000000
+TZNAME:AKST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T110000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T100000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:AKST
-DTSTART:19831130T000000
-RDATE:19831130T000000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T110000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AKST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Noronha.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Noronha.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Noronha.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,69 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Noronha
 X-LIC-LOCATION:America/Noronha
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-TZNAME:FNT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
+DTSTART:19140101T000000
+RDATE:19140101T000000
 TZNAME:FNST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-TZNAME:FNT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-TZNAME:FNT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:FNST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:FNST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:FNST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:-020940
 TZOFFSETTO:-0200
-TZNAME:FNT
-DTSTART:19140101T000000
-RDATE:19140101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:FNST
 DTSTART:19311003T110000
 RDATE:19311003T110000
 RDATE:19321003T000000
@@ -71,14 +20,32 @@
 RDATE:19650131T000000
 RDATE:19651201T000000
 RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
 RDATE:19881016T000000
 RDATE:19891015T000000
 RDATE:19991003T000000
+RDATE:20001008T000000
+RDATE:20011014T000000
+TZNAME:FNST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T010000Z;BYMONTH=4
+TZNAME:FNT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:FNT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T020000Z;BYMONTH=12
+TZNAME:FNST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -92,16 +59,46 @@
 RDATE:20000227T000000
 RDATE:20001015T000000
 RDATE:20020217T000000
+TZNAME:FNT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T010000Z;BYMONTH=4
+TZNAME:FNT
+TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T010000Z;BYMONTH=3
 TZNAME:FNT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T020000Z;BYMONTH=11
+TZNAME:FNST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900917T000000
 RDATE:19900917T000000
+RDATE:20021001T000000
+TZNAME:FNT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990930T000000
 RDATE:19990930T000000
 RDATE:20010913T000000
-RDATE:20021001T000000
+TZNAME:FNST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0200
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Beulah.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Beulah.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Beulah.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,122 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:America/North_Dakota/Beulah
+X-LIC-LOCATION:America/North_Dakota/Beulah
+BEGIN:STANDARD
+DTSTART:18831118T121253
+RDATE:18831118T121253
+TZNAME:MST
+TZOFFSETFROM:-064707
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;UNTIL=20100314T090000Z;BYDAY=2SU;BYMONTH=3
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;UNTIL=20091101T080000Z;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20101107T020000
+RDATE:20101107T020000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20110313T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20111106T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Center.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Center.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Center.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,121 +1,122 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/North_Dakota/Center
 X-LIC-LOCATION:America/North_Dakota/Center
+BEGIN:STANDARD
+DTSTART:18831118T121448
+RDATE:18831118T121448
+TZNAME:MST
+TZOFFSETFROM:-064512
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
 TZNAME:MST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T080000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19670430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19911027T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19911027T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19920405T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19930404T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19920405T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19921025T020000
+RDATE:19921025T020000
+TZNAME:CST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19931031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930404T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19931031T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-064512
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:18831118T121448
-RDATE:18831118T121448
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19921025T020000
-RDATE:19921025T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/New_Salem.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/New_Salem.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/New_Salem.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,121 +1,122 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/North_Dakota/New_Salem
 X-LIC-LOCATION:America/North_Dakota/New_Salem
+BEGIN:STANDARD
+DTSTART:18831118T121421
+RDATE:18831118T121421
+TZNAME:MST
+TZOFFSETFROM:-064539
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
 TZNAME:MST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T080000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19670430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20021027T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20021027T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20030406T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20040404T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20030406T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:20031026T020000
+RDATE:20031026T020000
+TZNAME:CST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20041031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20040404T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20041031T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-064539
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:18831118T121421
-RDATE:18831118T121421
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20031026T020000
-RDATE:20031026T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ojinaga.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ojinaga.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ojinaga.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,119 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:America/Ojinaga
+X-LIC-LOCATION:America/Ojinaga
+BEGIN:STANDARD
+DTSTART:19220101T000220
+RDATE:19220101T000220
+TZNAME:MST
+TZOFFSETFROM:-065740
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19270610T230000
+RDATE:19270610T230000
+RDATE:19310501T230000
+RDATE:19320401T000000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19301115T000000
+RDATE:19301115T000000
+RDATE:19311001T000000
+RDATE:20010930T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+RDATE:19980101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=19970406T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=19971026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19980405T030000
+RDATE:19980405T030000
+TZNAME:MDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19981025T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19990404T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20010506T020000
+RDATE:20010506T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20090405T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;UNTIL=20091025T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100101T000000
+RDATE:20100101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20101107T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Panama.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Panama.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Panama.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Panama
 X-LIC-LOCATION:America/Panama
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
 TZOFFSETFROM:-051808
 TZOFFSETTO:-051936
-TZNAME:CMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19080422T000000
+RDATE:19080422T000000
+TZNAME:EST
 TZOFFSETFROM:-051936
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19080422T000000
-RDATE:19080422T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Pangnirtung.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Pangnirtung.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Pangnirtung.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,141 +1,142 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Pangnirtung
 X-LIC-LOCATION:America/Pangnirtung
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19210101T000000
+RDATE:19210101T000000
+TZNAME:AST
+TZOFFSETFROM:+0000
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19941030T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19940403T060000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19951029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19981025T060000Z
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19990404T070000Z
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20010401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:ADDT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:AST
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19210101T000000
-RDATE:19210101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-TZNAME:APT
-DTSTART:19450814T200000
-RDATE:19450814T200000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19941030T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19940403T060000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-TZNAME:ADDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+DTSTART:19950402T020000
+RDATE:19950402T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19651031T020000
-RDATE:19651031T020000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19951029T020000
+RRULE:FREQ=YEARLY;UNTIL=19981025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=19990404T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19950402T020000
-RDATE:19950402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19991031T020000
+RDATE:19991031T020000
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19991031T020000
-RDATE:19991031T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20000402T020000
+RDATE:20000402T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20000402T020000
-RDATE:20000402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20001029T020000
+RDATE:20001029T020000
+TZNAME:EST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010401T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:20001029T020000
-RDATE:20001029T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Paramaribo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Paramaribo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Paramaribo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Paramaribo
 X-LIC-LOCATION:America/Paramaribo
 BEGIN:STANDARD
+DTSTART:19110101T000000
+RDATE:19110101T000000
+TZNAME:PMT
 TZOFFSETFROM:-034040
 TZOFFSETTO:-034052
-TZNAME:PMT
-DTSTART:19110101T000000
-RDATE:19110101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19350101T000000
+RDATE:19350101T000000
+TZNAME:PMT
 TZOFFSETFROM:-034052
 TZOFFSETTO:-034036
-TZNAME:PMT
-DTSTART:19350101T000000
-RDATE:19350101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19451001T000000
+RDATE:19451001T000000
+TZNAME:NEGT
 TZOFFSETFROM:-034036
 TZOFFSETTO:-0330
-TZNAME:NEGT
-DTSTART:19451001T000000
-RDATE:19451001T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19751120T000000
+RDATE:19751120T000000
+TZNAME:SRT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0330
-TZNAME:SRT
-DTSTART:19751120T000000
-RDATE:19751120T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19841001T000000
+RDATE:19841001T000000
+TZNAME:SRT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0300
-TZNAME:SRT
-DTSTART:19841001T000000
-RDATE:19841001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Phoenix.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Phoenix.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Phoenix.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,61 +1,68 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Phoenix
 X-LIC-LOCATION:America/Phoenix
+BEGIN:STANDARD
+DTSTART:18831118T113142
+RDATE:18831118T113142
+TZNAME:MST
+TZOFFSETFROM:-072818
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T080000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-072818
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:18831118T113142
-RDATE:18831118T113142
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-RDATE:19440401T000100
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
 DTSTART:19440101T000100
 RDATE:19440101T000100
 RDATE:19441001T000100
 RDATE:19671029T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19440401T000100
+RDATE:19440401T000100
+TZNAME:MST
 TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19670101T000000
 RDATE:19670101T000000
 RDATE:19680321T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RDATE:19670430T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19670430T020000
-RDATE:19670430T020000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port-au-Prince.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port-au-Prince.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port-au-Prince.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,71 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Port-au-Prince
 X-LIC-LOCATION:America/Port-au-Prince
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:PPMT
+TZOFFSETFROM:-044920
+TZOFFSETTO:-0449
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19170124T120000
+RDATE:19170124T120000
+TZNAME:EST
+TZOFFSETFROM:-0449
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19831030T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19871025T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19830508T000000
+RDATE:19830508T000000
 TZNAME:EDT
-DTSTART:19840429T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19870426T050000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19880403T010000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19970406T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19831030T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19881030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19840429T000000
+RRULE:FREQ=YEARLY;UNTIL=19870426T050000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19880403T010000
+RRULE:FREQ=YEARLY;UNTIL=19970406T060000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:20050403T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T050000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;UNTIL=19971026T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20051030T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T040000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-044920
-TZOFFSETTO:-0449
-TZNAME:PPMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0449
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19170124T120000
-RDATE:19170124T120000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20050403T000000
+RRULE:FREQ=YEARLY;UNTIL=20060402T050000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19830508T000000
-RDATE:19830508T000000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20051030T000000
+RRULE:FREQ=YEARLY;UNTIL=20061029T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port_of_Spain.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port_of_Spain.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port_of_Spain.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Port_of_Spain
 X-LIC-LOCATION:America/Port_of_Spain
 BEGIN:STANDARD
+DTSTART:19120302T000000
+RDATE:19120302T000000
+TZNAME:AST
 TZOFFSETFROM:-040604
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19120302T000000
-RDATE:19120302T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Acre.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Acre.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Acre.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,74 +1,46 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Porto_Acre
 X-LIC-LOCATION:America/Porto_Acre
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:ACST
+TZOFFSETFROM:-043112
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+TZNAME:ACST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
 TZNAME:ACT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
 TZNAME:ACST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-043112
-TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:ACT
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -77,20 +49,44 @@
 RDATE:19860315T000000
 RDATE:19870214T000000
 RDATE:19880207T000000
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z;BYMONTH=4
+TZNAME:ACT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z;BYMONTH=3
 TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z;BYMONTH=11
+TZNAME:ACST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
+TZNAME:ACT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:AMT
 DTSTART:20080624T000000
 RDATE:20080624T000000
+TZNAME:AMT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Velho.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Velho.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Velho.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,74 +1,46 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Porto_Velho
 X-LIC-LOCATION:America/Porto_Velho
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-041536
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
 TZNAME:AMT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z;BYMONTH=12
 TZNAME:AMST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-041536
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AMT
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -77,13 +49,37 @@
 RDATE:19860315T000000
 RDATE:19870214T000000
 RDATE:19880207T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z;BYMONTH=3
 TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z;BYMONTH=11
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
+TZNAME:AMT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Puerto_Rico.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Puerto_Rico.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Puerto_Rico.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Puerto_Rico
 X-LIC-LOCATION:America/Puerto_Rico
 BEGIN:STANDARD
+DTSTART:18990328T120000
+RDATE:18990328T120000
+TZNAME:AST
 TZOFFSETFROM:-042425
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420503T000000
+RDATE:19420503T000000
 TZNAME:AST
-DTSTART:18990328T120000
-RDATE:18990328T120000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AWT
-DTSTART:19420503T000000
-RDATE:19420503T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
-TZNAME:APT
-DTSTART:19450814T200000
-RDATE:19450814T200000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:AST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19460101T000000
-RDATE:19460101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rainy_River.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rainy_River.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rainy_River.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,80 +1,87 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Rainy_River
 X-LIC-LOCATION:America/Rainy_River
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CST
+TZOFFSETFROM:-061816
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19740428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400929T000000
+RDATE:19400929T000000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T030000
+RDATE:19420209T030000
+TZNAME:CWT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-061816
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18950101T000000
-RDATE:18950101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZNAME:CDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19400929T000000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rankin_Inlet.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rankin_Inlet.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rankin_Inlet.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,92 +1,93 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Rankin_Inlet
 X-LIC-LOCATION:America/Rankin_Inlet
+BEGIN:STANDARD
+DTSTART:19570101T000000
+RDATE:19570101T000000
+TZNAME:CST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:CDDT
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:CST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991031T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19991031T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001029T020000
+RDATE:20001029T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+DTSTART:20010401T030000
+RDATE:20010401T030000
+TZNAME:CDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19570101T000000
-RDATE:19570101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0400
-TZNAME:CDDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
+TZOFFSETTO:-0500
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0600
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:CST
-DTSTART:19651031T020000
-RDATE:19651031T020000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20001029T020000
-RDATE:20001029T020000
+TZOFFSETTO:-0600
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20010401T020000
-RDATE:20010401T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Recife.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Recife.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Recife.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,69 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Recife
 X-LIC-LOCATION:America/Recife
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19140101T000000
+RDATE:19140101T000000
 TZNAME:BRST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:-021936
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19140101T000000
-RDATE:19140101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:BRST
 DTSTART:19311003T110000
 RDATE:19311003T110000
 RDATE:19321003T000000
@@ -71,14 +20,32 @@
 RDATE:19650131T000000
 RDATE:19651201T000000
 RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
 RDATE:19881016T000000
 RDATE:19891015T000000
 RDATE:19991003T000000
+RDATE:20001008T000000
+RDATE:20011014T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z;BYMONTH=12
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -92,16 +59,46 @@
 RDATE:20000227T000000
 RDATE:20001015T000000
 RDATE:20020217T000000
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z;BYMONTH=4
+TZNAME:BRT
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z;BYMONTH=3
 TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z;BYMONTH=11
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900917T000000
 RDATE:19900917T000000
+RDATE:20021001T000000
+TZNAME:BRT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990930T000000
 RDATE:19990930T000000
 RDATE:20010913T000000
-RDATE:20021001T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Regina.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Regina.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Regina.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,99 +1,100 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Regina
 X-LIC-LOCATION:America/Regina
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19300504T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19340506T070000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+DTSTART:19050901T000000
+RDATE:19050901T000000
+TZNAME:MST
+TZOFFSETFROM:-065836
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19301005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19341007T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19460414T020000
+RDATE:19590426T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19370411T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=2SU;UNTIL=19410413T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19371010T000000
+RDATE:19381002T000000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19591025T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19391008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19411012T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19300504T000000
+RRULE:FREQ=YEARLY;UNTIL=19340506T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19570428T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19301005T000000
+RRULE:FREQ=YEARLY;UNTIL=19341007T060000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19570929T080000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-065836
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19050901T000000
-RDATE:19050901T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19370411T000000
+RRULE:FREQ=YEARLY;UNTIL=19410413T070000Z;BYDAY=2SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19460414T020000
-RDATE:19590426T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19391008T000000
+RRULE:FREQ=YEARLY;UNTIL=19411012T060000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19371010T000000
-RDATE:19381002T000000
-RDATE:19450930T020000
-RDATE:19461013T020000
-RDATE:19591025T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19570428T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:CST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;UNTIL=19570929T080000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19600424T020000
 RDATE:19600424T020000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Resolute.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Resolute.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Resolute.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,79 +1,100 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Resolute
 X-LIC-LOCATION:America/Resolute
+BEGIN:STANDARD
+DTSTART:19470831T000000
+RDATE:19470831T000000
+TZNAME:CST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:CDDT
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:CST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991031T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19991031T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20051030T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001029T020000
+RDATE:20001029T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010401T030000
+RDATE:20010401T030000
 TZNAME:CDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20051030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19470831T000000
-RDATE:19470831T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0400
-TZNAME:CDDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19651031T020000
-RDATE:19651031T020000
+DTSTART:20061029T020000
+RDATE:20061029T020000
+TZNAME:ST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20061105T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20001029T020000
-RDATE:20001029T020000
-RDATE:20061029T020000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20010401T020000
-RDATE:20010401T020000
-END:DAYLIGHT
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rio_Branco.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rio_Branco.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rio_Branco.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,74 +1,46 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Rio_Branco
 X-LIC-LOCATION:America/Rio_Branco
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:ACST
+TZOFFSETFROM:-043112
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+TZNAME:ACST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
 TZNAME:ACT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
 TZNAME:ACST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-043112
-TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:ACT
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -77,20 +49,44 @@
 RDATE:19860315T000000
 RDATE:19870214T000000
 RDATE:19880207T000000
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z;BYMONTH=4
+TZNAME:ACT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z;BYMONTH=3
 TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z;BYMONTH=11
+TZNAME:ACST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
+TZNAME:ACT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:AMT
 DTSTART:20080624T000000
 RDATE:20080624T000000
+TZNAME:AMT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rosario.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rosario.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rosario.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,176 +1,165 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Rosario
 X-LIC-LOCATION:America/Rosario
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19320301T000000
-RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-041648
+TZOFFSETTO:-041648
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19200501T000000
+RDATE:19200501T000000
 TZNAME:ART
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
+TZOFFSETFROM:-041648
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19301201T000000
+RDATE:19301201T000000
+RDATE:19311015T000000
+RDATE:19400701T000000
+RDATE:19411015T000000
+RDATE:19431015T000000
+RDATE:19461001T000000
+RDATE:19631215T000000
 TZNAME:ARST
-DTSTART:19641015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19410615T000000
+RDATE:19430801T000000
+RDATE:19460301T000000
+RDATE:19631001T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19320301T000000
+RRULE:FREQ=YEARLY;UNTIL=19400301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19890305T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19900304T020000Z
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
 TZNAME:ARST
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19901021T030000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
 TZNAME:ART
-DTSTART:19920301T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19930307T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:20080316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
-TZOFFSETTO:-041648
-TZNAME:CMT
-DTSTART:18941031T000000
-RDATE:18941031T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041648
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19200501T000000
-RDATE:19200501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19641015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:ARST
-DTSTART:19301201T000000
-RDATE:19301201T000000
-RDATE:19311015T000000
-RDATE:19400701T000000
-RDATE:19411015T000000
-RDATE:19431015T000000
-RDATE:19461001T000000
-RDATE:19631215T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19410615T000000
-RDATE:19430801T000000
-RDATE:19460301T000000
-RDATE:19631001T000000
-RDATE:19670402T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19691005T000000
 RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
 DTSTART:19740123T000000
 RDATE:19740123T000000
 RDATE:19881201T000000
 RDATE:19921018T000000
 RDATE:20071230T000000
+RDATE:20081019T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
 DTSTART:19740501T000000
 RDATE:19740501T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19890305T000000
+RRULE:FREQ=YEARLY;UNTIL=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-TZNAME:WART
-DTSTART:19910303T000000
-RDATE:19910303T000000
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19901021T030000Z;BYDAY=3SU;BYMONTH=10
 TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910303T000000
+RDATE:19910303T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19911020T000000
 RDATE:19911020T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
 TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920301T000000
+RRULE:FREQ=YEARLY;UNTIL=19930307T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19991003T000000
 RDATE:19991003T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+RDATE:20000303T000000
+TZNAME:ARST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080316T000000
+RRULE:FREQ=YEARLY;UNTIL=20090315T020000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:ART
-DTSTART:20000303T000000
-RDATE:20000303T000000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santa_Isabel.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santa_Isabel.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santa_Isabel.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,139 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:America/Santa_Isabel
+X-LIC-LOCATION:America/Santa_Isabel
+BEGIN:STANDARD
+DTSTART:19220101T002032
+RDATE:19220101T002032
+TZNAME:MST
+TZOFFSETFROM:-073928
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240101T000000
+RDATE:19240101T000000
+RDATE:19301115T000000
+RDATE:19310930T000000
+RDATE:19451112T000000
+RDATE:19490114T000000
+RDATE:20011028T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19270610T230000
+RDATE:19270610T230000
+TZNAME:MST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19480405T000000
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420424T000000
+RDATE:19420424T000000
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19540101T000000
+RDATE:19540101T000000
+RDATE:19610101T000000
+RDATE:19760101T000000
+RDATE:19960101T000000
+RDATE:20010101T000000
+RDATE:20020220T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19540425T020000
+RRULE:FREQ=YEARLY;UNTIL=19600424T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19540926T020000
+RRULE:FREQ=YEARLY;UNTIL=19600925T090000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19761031T020000
+RRULE:FREQ=YEARLY;UNTIL=19951029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19950402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010401T020000
+RDATE:20010401T020000
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santarem.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santarem.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santarem.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,74 +1,46 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Santarem
 X-LIC-LOCATION:America/Santarem
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-033848
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
 TZNAME:AMT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z;BYMONTH=12
 TZNAME:AMST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-033848
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AMT
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -77,20 +49,44 @@
 RDATE:19860315T000000
 RDATE:19870214T000000
 RDATE:19880207T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z;BYMONTH=3
 TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z;BYMONTH=11
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
+TZNAME:AMT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:BRT
 DTSTART:20080624T000000
 RDATE:20080624T000000
+TZNAME:BRT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santiago.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santiago.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santiago.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,168 +1,103 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Santiago
 X-LIC-LOCATION:America/Santiago
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:CLT
-DTSTART:19280401T000000
-RRULE:FREQ=YEARLY;UNTIL=19320401T040000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:CLST
-DTSTART:19280901T000000
-RRULE:FREQ=YEARLY;UNTIL=19320901T050000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19701011T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19721015T040000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19720312T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19860309T030000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19741013T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19871011T040000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19880313T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19890312T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19910310T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19960310T030000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19911013T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19971012T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19991010T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:20000312T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=20070311T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:20090315T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:SMT
 TZOFFSETFROM:-044246
 TZOFFSETTO:-044246
-TZNAME:SMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19100101T000000
+RDATE:19100101T000000
+TZNAME:CLT
 TZOFFSETFROM:-044246
 TZOFFSETTO:-0500
-TZNAME:CLT
-DTSTART:19100101T000000
-RDATE:19100101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19160701T000000
+RDATE:19160701T000000
+TZNAME:SMT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-044246
-TZNAME:SMT
-DTSTART:19160701T000000
-RDATE:19160701T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19180901T000000
+RDATE:19180901T000000
+TZNAME:CLT
 TZOFFSETFROM:-044246
 TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19180901T000000
-RDATE:19180901T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19190701T000000
+RDATE:19190701T000000
+TZNAME:SMT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-044246
-TZNAME:SMT
-DTSTART:19190701T000000
-RDATE:19190701T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19270901T000000
+RDATE:19270901T000000
+TZNAME:CLST
 TZOFFSETFROM:-044246
 TZOFFSETTO:-0400
-TZNAME:CLST
-DTSTART:19270901T000000
-RDATE:19270901T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19280401T000000
+RRULE:FREQ=YEARLY;UNTIL=19320401T040000Z;BYMONTH=4
+TZNAME:CLT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CLT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19280901T000000
+RRULE:FREQ=YEARLY;UNTIL=19320901T050000Z;BYMONTH=9
+TZNAME:CLST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19420601T000000
 RDATE:19420601T000000
 RDATE:19460831T230000
+TZNAME:CLT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420801T000000
+RDATE:19420801T000000
+TZNAME:CLST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CLST
-DTSTART:19420801T000000
-RDATE:19420801T000000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460715T000000
+RDATE:19460715T000000
+TZNAME:CLST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:CLST
-DTSTART:19460715T000000
-RDATE:19460715T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19470331T230000
+RDATE:19470331T230000
+TZNAME:CLT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CLT
-DTSTART:19470331T230000
-RDATE:19470331T230000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19470522T000000
+RDATE:19470522T000000
+TZNAME:CLST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19470522T000000
-RDATE:19470522T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
 DTSTART:19681103T000000
 RDATE:19681103T000000
 RDATE:19691123T000000
@@ -171,11 +106,11 @@
 RDATE:19891015T000000
 RDATE:19900916T000000
 RDATE:19980927T000000
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
 DTSTART:19690330T000000
 RDATE:19690330T000000
 RDATE:19700329T000000
@@ -186,6 +121,81 @@
 RDATE:19980315T000000
 RDATE:19990404T000000
 RDATE:20080330T000000
+RDATE:20090315T000000
+RDATE:20100404T000000
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19701011T000000
+RRULE:FREQ=YEARLY;UNTIL=19721015T040000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19720312T000000
+RRULE:FREQ=YEARLY;UNTIL=19860309T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19741013T000000
+RRULE:FREQ=YEARLY;UNTIL=19871011T040000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19880313T000000
+RRULE:FREQ=YEARLY;UNTIL=19890312T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910310T000000
+RRULE:FREQ=YEARLY;UNTIL=19960310T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19911013T000000
+RRULE:FREQ=YEARLY;UNTIL=19971012T040000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19991010T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20000312T000000
+RRULE:FREQ=YEARLY;UNTIL=20070311T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110313T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santo_Domingo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santo_Domingo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santo_Domingo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,67 +1,68 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Santo_Domingo
 X-LIC-LOCATION:America/Santo_Domingo
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0430
-TZNAME:EHDT
-DTSTART:19691026T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19731028T050000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0430
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19720121T000000
-RRULE:FREQ=YEARLY;UNTIL=19740121T043000Z
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:SDMT
 TZOFFSETFROM:-043936
 TZOFFSETTO:-0440
-TZNAME:SDMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19330401T120000
+RDATE:19330401T120000
+TZNAME:EST
 TZOFFSETFROM:-0440
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19330401T120000
-RDATE:19330401T120000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19661030T000000
+RDATE:19661030T000000
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19661030T000000
-RDATE:19661030T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19670228T000000
 RDATE:19670228T000000
 RDATE:20001029T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19691026T000000
+RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EHDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0430
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0430
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19700221T000000
 RDATE:19700221T000000
 RDATE:19710120T000000
+TZNAME:EST
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:AST
+DTSTART:19720121T000000
+RRULE:FREQ=YEARLY;UNTIL=19740121T043000Z;BYMONTH=1
+TZNAME:EST
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19741027T000000
 RDATE:19741027T000000
 RDATE:20001203T010000
+TZNAME:AST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Sao_Paulo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Sao_Paulo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Sao_Paulo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,209 +1,175 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Sao_Paulo
 X-LIC-LOCATION:America/Sao_Paulo
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-030628
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19901021T000000
+RDATE:19911020T000000
+RDATE:19921025T000000
+RDATE:19961006T000000
+RDATE:19971006T000000
+RDATE:19981011T000000
+RDATE:19991003T000000
+RDATE:20021103T000000
+RDATE:20031019T000000
+RDATE:20041102T000000
+RDATE:20051016T000000
+RDATE:20061105T000000
+RDATE:20071014T000000
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z;BYMONTH=12
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19500416T010000
+RDATE:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19910217T000000
+RDATE:19920209T000000
+RDATE:19930131T000000
+RDATE:19960211T000000
+RDATE:19970216T000000
+RDATE:19980301T000000
+RDATE:19990221T000000
+RDATE:20000227T000000
+RDATE:20070225T000000
+RDATE:20120226T000000
+RDATE:20150222T000000
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z;BYMONTH=4
 TZNAME:BRT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+BEGIN:STANDARD
+DTSTART:19631023T000000
+RDATE:19631023T000000
 TZNAME:BRST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
 TZNAME:BRST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19931017T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19951015T030000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z;BYMONTH=3
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19940220T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=19950219T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z;BYMONTH=11
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19961006T000000
-RRULE:FREQ=YEARLY;UNTIL=19971006T030000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;UNTIL=19951015T030000Z;BYDAY=-3SU;BYMONTH=10
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;UNTIL=19950219T020000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:BRT
-DTSTART:20010218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20060219T020000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20080217T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20110220T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;UNTIL=20011014T030000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;UNTIL=20060219T020000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:BRT
-DTSTART:20130217T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20140216T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20160221T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20220220T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;UNTIL=20110220T020000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:BRT
-DTSTART:20240218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20250216T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20270221T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20330220T030000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20350218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20360217T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-030628
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631023T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-RDATE:19881016T000000
-RDATE:19891015T000000
-RDATE:19901021T000000
-RDATE:19911020T000000
-RDATE:19921025T000000
-RDATE:19981011T000000
-RDATE:19991003T000000
-RDATE:20021103T000000
-RDATE:20031019T000000
-RDATE:20041102T000000
-RDATE:20051016T000000
-RDATE:20061105T000000
-RDATE:20071014T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;UNTIL=20140216T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19500416T010000
-RDATE:19500416T010000
-RDATE:19530301T000000
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:19890129T000000
-RDATE:19900211T000000
-RDATE:19910217T000000
-RDATE:19920209T000000
-RDATE:19930131T000000
-RDATE:19960211T000000
-RDATE:19970216T000000
-RDATE:19980301T000000
-RDATE:19990221T000000
-RDATE:20000227T000000
-RDATE:20070225T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19640101T000000
-RDATE:19640101T000000
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;UNTIL=20170219T020000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:BRT
-DTSTART:20120226T000000
-RDATE:20120226T000000
-RDATE:20150222T000000
-RDATE:20230226T000000
-RDATE:20260222T000000
-RDATE:20340226T000000
-RDATE:20370222T000000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Scoresbysund.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Scoresbysund.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Scoresbysund.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Scoresbysund
 X-LIC-LOCATION:America/Scoresbysund
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:EGT
-DTSTART:19810927T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:EGST
-DTSTART:19820328T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:EGT
-DTSTART:19961027T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19160728T000000
+RDATE:19160728T000000
+TZNAME:CGT
 TZOFFSETFROM:-012752
 TZOFFSETTO:-0200
-TZNAME:CGT
-DTSTART:19160728T000000
-RDATE:19160728T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19800406T020000
+RDATE:19800406T020000
+TZNAME:CGST
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0100
-TZNAME:CGST
-DTSTART:19800406T020000
-RDATE:19800406T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19800928T030000
+RDATE:19800928T030000
+TZNAME:CGT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:CGT
-DTSTART:19800928T030000
-RDATE:19800928T030000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19810329T000000
+RDATE:19810329T000000
+TZNAME:EGST
 TZOFFSETFROM:-0200
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810927T010000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EGT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19820328T000000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:EGST
-DTSTART:19810329T000000
-RDATE:19810329T000000
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EGT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Shiprock.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Shiprock.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Shiprock.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,111 +1,134 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Shiprock
 X-LIC-LOCATION:America/Shiprock
+BEGIN:STANDARD
+DTSTART:18831118T120004
+RDATE:18831118T120004
+TZNAME:MST
+TZOFFSETFROM:-065956
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19210327T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
 TZNAME:MST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T080000Z
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200328T020000
+RRULE:FREQ=YEARLY;UNTIL=19210327T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19650425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19210522T020000
+RDATE:19450930T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19651031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19650425T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-065956
-TZOFFSETTO:-0700
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:MST
-DTSTART:18831118T120004
-RDATE:18831118T120004
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19210522T020000
-RDATE:19210522T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZNAME:MDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Barthelemy.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Barthelemy.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Barthelemy.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/St_Barthelemy
 X-LIC-LOCATION:America/St_Barthelemy
 BEGIN:STANDARD
+DTSTART:19110608T000000
+RDATE:19110608T000000
+TZNAME:AST
 TZOFFSETFROM:-040608
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110608T000000
-RDATE:19110608T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Johns.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Johns.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Johns.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,190 +1,189 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/St_Johns
 X-LIC-LOCATION:America/St_Johns
 BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+RDATE:19180101T000000
+RDATE:19190101T000000
+TZNAME:NST
 TZOFFSETFROM:-033052
 TZOFFSETTO:-033052
-TZNAME:NST
-DTSTART:19180101T000000
-RRULE:FREQ=YEARLY;UNTIL=19190101T033052Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170408T020000
+RDATE:19170408T020000
+RDATE:19180414T020000
+RDATE:19190505T230000
+TZNAME:NDT
 TZOFFSETFROM:-033052
 TZOFFSETTO:-023052
-TZNAME:NDT
-DTSTART:19200502T230000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19340507T023052Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170917T020000
+RDATE:19170917T020000
+RDATE:19181031T020000
+RDATE:19190812T230000
+TZNAME:NST
 TZOFFSETFROM:-023052
 TZOFFSETTO:-033052
-TZNAME:NST
-DTSTART:19201031T230000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19341029T013052Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
+DTSTART:19200502T230000
+RRULE:FREQ=YEARLY;UNTIL=19340507T023052Z;BYDAY=1SU;BYMONTH=5
 TZNAME:NDT
-DTSTART:19360511T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=MO;UNTIL=19410512T033000Z
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
+DTSTART:19201031T230000
+RRULE:FREQ=YEARLY;UNTIL=19341029T013052Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NST
-DTSTART:19361005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19411006T023000Z
+TZOFFSETFROM:-023052
+TZOFFSETTO:-033052
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19350330T000000
+RDATE:19350330T000000
+TZNAME:NST
+TZOFFSETFROM:-033052
+TZOFFSETTO:-0330
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19350505T230000
+RDATE:19350505T230000
+RDATE:19870405T000100
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19460512T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19500514T053000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19351027T230000
+RDATE:19351027T230000
+RDATE:19450930T020000
+RDATE:19871025T000100
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19461006T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19501008T043000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19360511T000000
+RRULE:FREQ=YEARLY;UNTIL=19410512T033000Z;BYDAY=MO;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=5
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T053000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19361005T000000
+RRULE:FREQ=YEARLY;UNTIL=19411006T023000Z;BYDAY=MO;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T043000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
+DTSTART:19420511T000000
+RDATE:19420511T000000
 TZNAME:NST
-DTSTART:19601030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19861026T043000Z
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0330
+DTSTART:19450814T203000
+RDATE:19450814T203000
+TZNAME:NPT
+TZOFFSETFROM:-0230
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19890402T000100
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T033100Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
+DTSTART:19460101T000000
+RDATE:19460101T000000
 TZNAME:NST
-DTSTART:19891029T000100
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T023100Z
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19460512T020000
+RRULE:FREQ=YEARLY;UNTIL=19500514T053000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:20070311T000100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19461006T020000
+RRULE:FREQ=YEARLY;UNTIL=19501008T043000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:20071104T000100
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-033052
-TZOFFSETTO:-033052
-TZNAME:NST
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-033052
-TZOFFSETTO:-023052
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T053000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:NDT
-DTSTART:19170408T020000
-RDATE:19170408T020000
-RDATE:19180414T020000
-RDATE:19190505T230000
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-023052
-TZOFFSETTO:-033052
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T043000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:NST
-DTSTART:19170917T020000
-RDATE:19170917T020000
-RDATE:19181031T020000
-RDATE:19190812T230000
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-033052
-TZOFFSETTO:-0330
+DTSTART:19601030T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T043000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NST
-DTSTART:19350330T000000
-RDATE:19350330T000000
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19880403T000100
+RDATE:19880403T000100
+TZNAME:NDDT
 TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19350505T230000
-RDATE:19350505T230000
-RDATE:19870405T000100
+TZOFFSETTO:-0130
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
+DTSTART:19881030T000100
+RDATE:19881030T000100
 TZNAME:NST
-DTSTART:19351027T230000
-RDATE:19351027T230000
-RDATE:19450930T020000
-RDATE:19871025T000100
+TZOFFSETFROM:-0130
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19890402T000100
+RRULE:FREQ=YEARLY;UNTIL=20060402T033100Z;BYDAY=1SU;BYMONTH=4
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NWT
-DTSTART:19420511T000000
-RDATE:19420511T000000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0230
-TZNAME:NPT
-DTSTART:19450814T203000
-RDATE:19450814T203000
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0330
+DTSTART:19891029T000100
+RRULE:FREQ=YEARLY;UNTIL=20061029T023100Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NST
-DTSTART:19460101T000000
-RDATE:19460101T000000
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:NDT
 TZOFFSETFROM:-0330
-TZOFFSETTO:-0130
-TZNAME:NDDT
-DTSTART:19880403T000100
-RDATE:19880403T000100
+TZOFFSETTO:-0230
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0130
-TZOFFSETTO:-0330
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:NST
-DTSTART:19881030T000100
-RDATE:19881030T000100
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Kitts.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Kitts.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Kitts.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/St_Kitts
 X-LIC-LOCATION:America/St_Kitts
 BEGIN:STANDARD
+DTSTART:19120302T000000
+RDATE:19120302T000000
+TZNAME:AST
 TZOFFSETFROM:-041052
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19120302T000000
-RDATE:19120302T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Lucia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Lucia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Lucia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/St_Lucia
 X-LIC-LOCATION:America/St_Lucia
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
 TZOFFSETFROM:-0404
 TZOFFSETTO:-0404
-TZNAME:CMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:AST
 TZOFFSETFROM:-0404
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Thomas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Thomas.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Thomas.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/St_Thomas
 X-LIC-LOCATION:America/St_Thomas
 BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:AST
 TZOFFSETFROM:-041944
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110701T000000
-RDATE:19110701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Vincent.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Vincent.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Vincent.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/St_Vincent
 X-LIC-LOCATION:America/St_Vincent
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KMT
 TZOFFSETFROM:-040456
 TZOFFSETTO:-040456
-TZNAME:KMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:AST
 TZOFFSETFROM:-040456
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Swift_Current.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Swift_Current.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Swift_Current.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,90 +1,98 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Swift_Current
 X-LIC-LOCATION:America/Swift_Current
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T090000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
+DTSTART:19050901T000000
+RDATE:19050901T000000
 TZNAME:MST
-DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19490925T080000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19590426T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19610430T090000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19600925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T080000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-071120
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19050901T000000
-RDATE:19050901T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
 DTSTART:19180414T020000
 RDATE:19180414T020000
 RDATE:19570428T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
 DTSTART:19181031T020000
 RDATE:19181031T020000
 RDATE:19450930T020000
 RDATE:19461013T020000
 RDATE:19571027T020000
 RDATE:19591025T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460428T020000
+RDATE:19460428T020000
+TZNAME:MST
 TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19490424T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;UNTIL=19490925T080000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19500101T000000
 RDATE:19500101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19590426T020000
+RRULE:FREQ=YEARLY;UNTIL=19610430T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:CST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19600925T020000
+RRULE:FREQ=YEARLY;UNTIL=19610924T080000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19720430T020000
 RDATE:19720430T020000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tegucigalpa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tegucigalpa.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tegucigalpa.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Tegucigalpa
 X-LIC-LOCATION:America/Tegucigalpa
+BEGIN:STANDARD
+DTSTART:19210401T000000
+RDATE:19210401T000000
+TZNAME:CST
+TZOFFSETFROM:-054852
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870503T000000
+RRULE:FREQ=YEARLY;UNTIL=19880501T060000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870503T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19880501T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19870927T000000
+RRULE:FREQ=YEARLY;UNTIL=19880925T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19870927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880925T050000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054852
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19210401T000000
-RDATE:19210401T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20060507T000000
+RDATE:20060507T000000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20060507T000000
-RDATE:20060507T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20060807T000000
+RDATE:20060807T000000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20060807T000000
-RDATE:20060807T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thule.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thule.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thule.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Thule
 X-LIC-LOCATION:America/Thule
+BEGIN:STANDARD
+DTSTART:19160728T000000
+RDATE:19160728T000000
+TZNAME:AST
+TZOFFSETFROM:-043508
+TZOFFSETTO:-0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19910331T020000
+RRULE:FREQ=YEARLY;UNTIL=19920329T060000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19910331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19920329T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910929T020000
+RRULE:FREQ=YEARLY;UNTIL=19920927T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19910929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19920927T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930404T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T060000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19930404T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19931031T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19931031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-043508
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19160728T000000
-RDATE:19160728T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thunder_Bay.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thunder_Bay.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thunder_Bay.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,107 +1,103 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Thunder_Bay
 X-LIC-LOCATION:America/Thunder_Bay
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19700426T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19720430T070000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CST
+TZOFFSETFROM:-0557
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19100101T000000
+RDATE:19100101T000000
 TZNAME:EST
-DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19721029T060000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19700101T000000
+RDATE:19730101T000000
+RDATE:19740101T000000
+TZNAME:EST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19730101T000000
-RRULE:FREQ=YEARLY;UNTIL=19740101T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:EWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19740428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19700426T020000
+RRULE:FREQ=YEARLY;UNTIL=19720430T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19701025T020000
+RRULE:FREQ=YEARLY;UNTIL=19721029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0557
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18950101T000000
-RDATE:18950101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:19100101T000000
-RDATE:19100101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19700101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tijuana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tijuana.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tijuana.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,102 +1,154 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Tijuana
 X-LIC-LOCATION:America/Tijuana
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19220101T001156
+RDATE:19220101T001156
+TZNAME:MST
+TZOFFSETFROM:-074804
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240101T000000
+RDATE:19240101T000000
+RDATE:19301115T000000
+RDATE:19310930T000000
+RDATE:19451112T000000
+RDATE:19490114T000000
+RDATE:20011028T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19270610T230000
+RDATE:19270610T230000
+TZNAME:MST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19480405T000000
 TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420424T000000
+RDATE:19420424T000000
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19540101T000000
+RDATE:19540101T000000
+RDATE:19610101T000000
+RDATE:19760101T000000
+RDATE:19960101T000000
+RDATE:20010101T000000
+RDATE:20020220T000000
+RDATE:20100101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19540425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T100000Z
+RRULE:FREQ=YEARLY;UNTIL=19600424T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19540926T020000
+RRULE:FREQ=YEARLY;UNTIL=19600925T090000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19540926T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19761031T020000
+RRULE:FREQ=YEARLY;UNTIL=19951029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19761031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19950402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T100000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-074804
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19220101T001156
-RDATE:19220101T001156
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19240101T000000
-RDATE:19240101T000000
-RDATE:19301115T000000
-RDATE:19310930T000000
-RDATE:19451112T000000
-RDATE:19490114T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19270610T230000
-RDATE:19270610T230000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010401T020000
+RDATE:20010401T020000
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19480405T000000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20090405T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PWT
-DTSTART:19420424T000000
-RDATE:19420424T000000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;UNTIL=20091025T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PPT
-DTSTART:19450814T160000
-RDATE:19450814T160000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
+DTSTART:20101107T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19540101T000000
-RDATE:19540101T000000
-RDATE:19610101T000000
-RDATE:19760101T000000
-RDATE:19960101T000000
-RDATE:20010101T000000
-RDATE:20020220T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Toronto.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Toronto.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Toronto.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,170 +1,185 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Toronto
 X-LIC-LOCATION:America/Toronto
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:EST
+TZOFFSETFROM:-051732
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19190330T233000
+RDATE:19200502T020000
+RDATE:19210515T020000
+RDATE:19320501T020000
+RDATE:19460428T020000
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19220514T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19230513T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19191026T000000
+RDATE:19200926T000000
+RDATE:19210915T020000
+RDATE:19331001T020000
+RDATE:19450930T020000
+RDATE:19460929T020000
+RDATE:19491127T000000
+RDATE:19501126T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19190101T000000
+RDATE:19190101T000000
+RDATE:19460101T000000
+RDATE:19740101T000000
 TZNAME:EST
-DTSTART:19220917T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19260919T060000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19220514T020000
+RRULE:FREQ=YEARLY;UNTIL=19230513T070000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19240504T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19270501T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19220917T020000
+RRULE:FREQ=YEARLY;UNTIL=19260919T060000Z;BYDAY=3SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19270925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19320925T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19240504T020000
+RRULE:FREQ=YEARLY;UNTIL=19270501T070000Z;BYDAY=1SU;BYMONTH=5
 TZNAME:EDT
-DTSTART:19280429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19310426T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19330430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19400428T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19270925T020000
+RRULE:FREQ=YEARLY;UNTIL=19320925T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19340930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19390924T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280429T020000
+RRULE:FREQ=YEARLY;UNTIL=19310426T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19330430T020000
+RRULE:FREQ=YEARLY;UNTIL=19400428T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:19470427T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T050000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19340930T020000
+RRULE:FREQ=YEARLY;UNTIL=19390924T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19470928T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19480926T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T030000
+RDATE:19420209T030000
+TZNAME:EWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470427T000000
+RRULE:FREQ=YEARLY;UNTIL=19490424T050000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19500430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:19470928T000000
+RRULE:FREQ=YEARLY;UNTIL=19480926T040000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:EST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19560930T060000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19571027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19500430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19560930T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-051732
+DTSTART:19571027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:18950101T000000
-RDATE:18950101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19190330T233000
-RDATE:19200502T020000
-RDATE:19210515T020000
-RDATE:19320501T020000
-RDATE:19460428T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19191026T000000
-RDATE:19200926T000000
-RDATE:19210915T020000
-RDATE:19331001T020000
-RDATE:19450930T020000
-RDATE:19460929T020000
-RDATE:19491127T000000
-RDATE:19501126T020000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19190101T000000
-RDATE:19190101T000000
-RDATE:19460101T000000
-RDATE:19740101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tortola.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tortola.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tortola.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Tortola
 X-LIC-LOCATION:America/Tortola
 BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:AST
 TZOFFSETFROM:-041828
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110701T000000
-RDATE:19110701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Vancouver.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Vancouver.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Vancouver.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,94 +1,102 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Vancouver
 X-LIC-LOCATION:America/Vancouver
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:PST
+TZOFFSETFROM:-081228
+TZOFFSETTO:-0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+RDATE:19461013T020000
 TZNAME:PST
-DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T090000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:PWT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;UNTIL=19610924T090000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T090000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:PST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-081228
+DTSTART:19870101T000000
+RDATE:19870101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
-RDATE:19461013T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
 TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:PPT
-DTSTART:19450814T160000
-RDATE:19450814T160000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19870101T000000
-RDATE:19870101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Virgin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Virgin.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Virgin.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Virgin
 X-LIC-LOCATION:America/Virgin
 BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:AST
 TZOFFSETFROM:-041944
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19110701T000000
-RDATE:19110701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Whitehorse.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Whitehorse.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Whitehorse.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,108 +1,110 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Whitehorse
 X-LIC-LOCATION:America/Whitehorse
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19000820T000000
+RDATE:19000820T000000
+TZNAME:YST
 TZOFFSETFROM:-090012
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19000820T000000
-RDATE:19000820T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:YDT
 DTSTART:19180414T020000
 RDATE:19180414T020000
 RDATE:19190525T020000
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:YST
 DTSTART:19181027T020000
 RDATE:19181027T020000
 RDATE:19191101T000000
 RDATE:19450930T020000
+TZNAME:YST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:YWT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-TZNAME:YWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T150000
+RDATE:19450814T150000
+TZNAME:YPT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:YPT
-DTSTART:19450814T150000
-RDATE:19450814T150000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:YDDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0700
-TZNAME:YDDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:YST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19651031T020000
-RDATE:19651031T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19660701T020000
+RDATE:19660701T020000
+TZNAME:PST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-DTSTART:19660701T020000
-RDATE:19660701T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:PST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:PST
-DTSTART:19800101T000000
-RDATE:19800101T000000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Winnipeg.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Winnipeg.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Winnipeg.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,128 +1,129 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Winnipeg
 X-LIC-LOCATION:America/Winnipeg
+BEGIN:STANDARD
+DTSTART:18870716T000000
+RDATE:18870716T000000
+TZNAME:CST
+TZOFFSETFROM:-062836
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160423T000000
+RDATE:19160423T000000
+RDATE:19180414T020000
+RDATE:19370516T020000
+RDATE:19460512T020000
+RDATE:19500501T020000
+RDATE:19630428T020000
+RDATE:20060402T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19160917T000000
+RDATE:19160917T000000
+RDATE:19181031T020000
+RDATE:19370926T020000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19500930T020000
+RDATE:19591025T020000
+RDATE:19600925T020000
+RDATE:19630922T020000
+RDATE:20061029T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19490925T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19490424T080000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T080000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;UNTIL=19490925T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19600424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19660424T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19661030T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20051030T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
+DTSTART:19660424T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20050403T080000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19661030T030000
+RRULE:FREQ=YEARLY;UNTIL=20051030T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-062836
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18870716T000000
-RDATE:18870716T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20050403T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19160423T000000
-RDATE:19160423T000000
-RDATE:19180414T020000
-RDATE:19370516T020000
-RDATE:19460512T020000
-RDATE:19500501T020000
-RDATE:19630428T020000
-RDATE:20060402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:20060101T000000
+RDATE:20060101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19160917T000000
-RDATE:19160917T000000
-RDATE:19181031T020000
-RDATE:19370926T020000
-RDATE:19450930T020000
-RDATE:19461013T020000
-RDATE:19500930T020000
-RDATE:19591025T020000
-RDATE:19600925T020000
-RDATE:19630922T020000
-RDATE:20061029T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20060101T000000
-RDATE:20060101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yakutat.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yakutat.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yakutat.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,123 +1,117 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Yakutat
 X-LIC-LOCATION:America/Yakutat
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:YST
+TZOFFSETFROM:-091855
+TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19690101T000000
+TZNAME:YST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:YWT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-TZNAME:YDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T110000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T150000
+RDATE:19450814T150000
+TZNAME:YPT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:YST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19831030T100000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T110000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:YDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T110000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19840429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19831030T100000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:YST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:19841028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:YDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T110000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:YDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
+DTSTART:19831130T000000
+RDATE:19831130T000000
 TZNAME:AKST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+144105
-TZOFFSETTO:-091855
-TZNAME:LMT
-DTSTART:18671018T000000
-RDATE:18671018T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-091855
-TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19000820T120000
-RDATE:19000820T120000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19690101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T110000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:AKDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-TZNAME:YWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-TZNAME:YPT
-DTSTART:19450814T150000
-RDATE:19450814T150000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T100000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AKST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T110000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AKDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-TZNAME:YDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:AKDT
 TZOFFSETFROM:-0900
-TZOFFSETTO:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:AKST
-DTSTART:19831130T000000
-RDATE:19831130T000000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yellowknife.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yellowknife.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yellowknife.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,92 +1,93 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America/Yellowknife
 X-LIC-LOCATION:America/Yellowknife
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+DTSTART:19350101T000000
+RDATE:19350101T000000
+TZNAME:MST
+TZOFFSETFROM:+0000
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:MDDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
 TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19350101T000000
-RDATE:19350101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
-TZOFFSETTO:-0500
-TZNAME:MDDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0700
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:MST
-DTSTART:19651031T020000
-RDATE:19651031T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19800101T000000
-RDATE:19800101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Casey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Casey.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Casey.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/Casey
 X-LIC-LOCATION:Antarctica/Casey
 BEGIN:STANDARD
+DTSTART:19690101T000000
+RDATE:19690101T000000
+TZNAME:WST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20091018T020000
+RDATE:20091018T020000
+TZNAME:CAST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100305T020000
+RDATE:20100305T020000
 TZNAME:WST
-DTSTART:19690101T000000
-RDATE:19690101T000000
+TZOFFSETFROM:+1100
+TZOFFSETTO:+0800
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Davis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Davis.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Davis.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,23 +1,38 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/Davis
 X-LIC-LOCATION:Antarctica/Davis
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0700
-TZNAME:DAVT
 DTSTART:19570113T000000
 RDATE:19570113T000000
 RDATE:19690201T000000
+TZNAME:DAVT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0700
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19641101T000000
+RDATE:19641101T000000
+TZNAME:zzz
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0000
-TZNAME:zzz
-DTSTART:19641101T000000
-RDATE:19641101T000000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:20091018T020000
+RDATE:20091018T020000
+TZNAME:DAVT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100311T010000
+RDATE:20100311T010000
+TZNAME:DAVT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/DumontDUrville.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/DumontDUrville.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/DumontDUrville.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/DumontDUrville
 X-LIC-LOCATION:Antarctica/DumontDUrville
 BEGIN:STANDARD
+DTSTART:19470101T000000
+RDATE:19470101T000000
+TZNAME:PMT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+1000
-TZNAME:PMT
-DTSTART:19470101T000000
-RDATE:19470101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19520114T000000
+RDATE:19520114T000000
+TZNAME:zzz
 TZOFFSETFROM:+1000
 TZOFFSETTO:+0000
-TZNAME:zzz
-DTSTART:19520114T000000
-RDATE:19520114T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19561101T000000
+RDATE:19561101T000000
+TZNAME:DDUT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+1000
-TZNAME:DDUT
-DTSTART:19561101T000000
-RDATE:19561101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Macquarie.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Macquarie.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Macquarie.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,153 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Antarctica/Macquarie
+X-LIC-LOCATION:Antarctica/Macquarie
+BEGIN:STANDARD
+DTSTART:19110101T000000
+RDATE:19110101T000000
+TZNAME:EST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19161001T020000
+RDATE:19161001T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19170201T000000
+RDATE:19170201T000000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19680331T030000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420101T020000
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19671001T020000
+RDATE:19861019T020000
+RDATE:19871025T020000
+RDATE:20000827T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19670101T000000
+RDATE:19670101T000000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19690309T030000
+RRULE:FREQ=YEARLY;UNTIL=19710313T160000Z;BYDAY=2SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820328T030000
+RRULE:FREQ=YEARLY;UNTIL=19830326T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840304T030000
+RRULE:FREQ=YEARLY;UNTIL=19860301T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870315T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;UNTIL=19901027T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19911006T020000
+RRULE:FREQ=YEARLY;UNTIL=19991002T160000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20011007T020000
+RRULE:FREQ=YEARLY;UNTIL=20091003T160000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;UNTIL=20090404T160000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100404T030000
+RDATE:20100404T030000
+TZNAME:MIST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Mawson.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Mawson.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Mawson.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/Mawson
 X-LIC-LOCATION:Antarctica/Mawson
 BEGIN:STANDARD
+DTSTART:19540213T000000
+RDATE:19540213T000000
+TZNAME:MAWT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20091018T020000
+RDATE:20091018T020000
 TZNAME:MAWT
-DTSTART:19540213T000000
-RDATE:19540213T000000
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/McMurdo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/McMurdo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/McMurdo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,72 +1,73 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/McMurdo
 X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+DTSTART:19560101T000000
+RDATE:19560101T000000
+TZNAME:NZST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+1200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19741103T020000
+RDATE:19741103T020000
+RDATE:19891008T020000
+TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19881029T140000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
+DTSTART:19750223T030000
+RDATE:19750223T030000
 TZNAME:NZST
-DTSTART:19760307T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19890304T140000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NZDT
-DTSTART:19901007T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:20070930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19760307T030000
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19560101T000000
-RDATE:19560101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19901007T020000
+RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070930T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9
 TZNAME:NZDT
-DTSTART:19741103T020000
-RDATE:19741103T020000
-RDATE:19891008T020000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19750223T030000
-RDATE:19750223T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Palmer.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Palmer.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Palmer.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,142 +1,154 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/Palmer
 X-LIC-LOCATION:Antarctica/Palmer
 BEGIN:STANDARD
+DTSTART:19650101T000000
+RDATE:19650101T000000
+TZNAME:ARST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19650301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19650301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19651015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
 TZNAME:ARST
-DTSTART:19651015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19681006T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19670402T000000
+RDATE:19670402T000000
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19680407T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19690406T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:ARST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19821010T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19871011T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19680407T000000
+RRULE:FREQ=YEARLY;UNTIL=19690406T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ART
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19830313T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19860309T030000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+TZNAME:ARST
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19880313T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19890312T030000Z
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19740501T000000
+RDATE:19740501T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19820501T000000
+RDATE:19820501T000000
+TZNAME:CLST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19910310T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19960310T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19821010T000000
+RRULE:FREQ=YEARLY;UNTIL=19871011T040000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=10
 TZNAME:CLST
-DTSTART:19911013T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19971012T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19991010T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830313T000000
+RRULE:FREQ=YEARLY;UNTIL=19860309T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870412T000000
+RDATE:19870412T000000
+RDATE:19900318T000000
+RDATE:19970330T000000
+RDATE:19980315T000000
+RDATE:19990404T000000
 TZNAME:CLT
-DTSTART:20000312T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0300
-TZNAME:ARST
-DTSTART:19650101T000000
-RDATE:19650101T000000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19880313T000000
+RRULE:FREQ=YEARLY;UNTIL=19890312T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:ART
-DTSTART:19670402T000000
-RDATE:19670402T000000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19881002T000000
+RDATE:19881002T000000
+RDATE:19891015T000000
+RDATE:19900916T000000
+RDATE:19980927T000000
+TZNAME:CLST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19691005T000000
-RDATE:19691005T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-TZNAME:ARST
-DTSTART:19740123T000000
-RDATE:19740123T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-TZNAME:ART
-DTSTART:19740501T000000
-RDATE:19740501T000000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19910310T000000
+RRULE:FREQ=YEARLY;UNTIL=19960310T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19820501T000000
-RDATE:19820501T000000
-RDATE:19870412T000000
-RDATE:19900318T000000
-RDATE:19970330T000000
-RDATE:19980315T000000
-RDATE:19990404T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19911013T000000
+RRULE:FREQ=YEARLY;UNTIL=19971012T040000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=10
+TZNAME:CLST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19991010T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=10
 TZNAME:CLST
-DTSTART:19881002T000000
-RDATE:19881002T000000
-RDATE:19891015T000000
-RDATE:19900916T000000
-RDATE:19980927T000000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20000312T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Rothera.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Rothera.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Rothera.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/Rothera
 X-LIC-LOCATION:Antarctica/Rothera
 BEGIN:STANDARD
+DTSTART:19761201T000000
+RDATE:19761201T000000
+TZNAME:ROTT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0300
-TZNAME:ROTT
-DTSTART:19761201T000000
-RDATE:19761201T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/South_Pole.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/South_Pole.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/South_Pole.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,72 +1,73 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/South_Pole
 X-LIC-LOCATION:Antarctica/South_Pole
+BEGIN:STANDARD
+DTSTART:19560101T000000
+RDATE:19560101T000000
+TZNAME:NZST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+1200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19741103T020000
+RDATE:19741103T020000
+RDATE:19891008T020000
+TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19881029T140000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
+DTSTART:19750223T030000
+RDATE:19750223T030000
 TZNAME:NZST
-DTSTART:19760307T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19890304T140000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NZDT
-DTSTART:19901007T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:20070930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19760307T030000
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19560101T000000
-RDATE:19560101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19901007T020000
+RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070930T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9
 TZNAME:NZDT
-DTSTART:19741103T020000
-RDATE:19741103T020000
-RDATE:19891008T020000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19750223T030000
-RDATE:19750223T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Syowa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Syowa.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Syowa.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/Syowa
 X-LIC-LOCATION:Antarctica/Syowa
 BEGIN:STANDARD
+DTSTART:19570129T000000
+RDATE:19570129T000000
+TZNAME:SYOT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0300
-TZNAME:SYOT
-DTSTART:19570129T000000
-RDATE:19570129T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Vostok.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Vostok.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Vostok.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Antarctica/Vostok
 X-LIC-LOCATION:Antarctica/Vostok
 BEGIN:STANDARD
+DTSTART:19571216T000000
+RDATE:19571216T000000
+TZNAME:VOST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0600
-TZNAME:VOST
-DTSTART:19571216T000000
-RDATE:19571216T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Arctic/Longyearbyen.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Arctic/Longyearbyen.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Arctic/Longyearbyen.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,81 +1,88 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Arctic/Longyearbyen
 X-LIC-LOCATION:Arctic/Longyearbyen
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0043
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160522T010000
+RDATE:19160522T010000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19650425T020000
+RDATE:19800406T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19590315T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19640315T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19160930T000000
+RDATE:19160930T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451001T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19590920T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19650919T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+DTSTART:19400810T230000
+RDATE:19400810T230000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19590315T020000
+RRULE:FREQ=YEARLY;UNTIL=19640315T010000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19590920T030000
+RRULE:FREQ=YEARLY;UNTIL=19650919T010000Z;BYDAY=3SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0043
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
-DTSTART:18950101T000000
-RDATE:18950101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19160522T010000
-RDATE:19160522T010000
-RDATE:19400810T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19650425T020000
-RDATE:19800406T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19160930T000000
-RDATE:19160930T000000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451001T030000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800101T000000
-RDATE:19800101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aden.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aden.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aden.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Aden
 X-LIC-LOCATION:Asia/Aden
 BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:AST
 TZOFFSETFROM:+030048
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19500101T000000
-RDATE:19500101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Almaty.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Almaty.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Almaty.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,99 +1,101 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Almaty
 X-LIC-LOCATION:Asia/Almaty
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:ALMT
+TZOFFSETFROM:+050748
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:ALMST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z;BYMONTH=4
+TZNAME:ALMST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:ALMST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
+TZNAME:ALMT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:ALMT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ALMT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:ALMT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ALMST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:ALMST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+RDATE:20050315T000000
+TZNAME:ALMT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:ALMT
-DTSTART:19910101T000000
-RRULE:FREQ=YEARLY;UNTIL=19911231T180000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
+TZNAME:ALMST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:ALMST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:ALMST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T200000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:ALMT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T200000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:ALMT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20041030T200000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+050748
-TZOFFSETTO:+0500
-TZNAME:ALMT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-TZNAME:ALMT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20040327T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ALMST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:ALMST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ALMT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:ALMT
-DTSTART:19920926T230000
-RDATE:19920926T230000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20041030T200000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:ALMT
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:ALMT
-DTSTART:20050315T000000
-RDATE:20050315T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Amman.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Amman.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Amman.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,114 +1,122 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Amman
 X-LIC-LOCATION:Asia/Amman
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:EEST
+TZOFFSETFROM:+022344
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19731001T000000
-RRULE:FREQ=YEARLY;UNTIL=19750930T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19730606T000000
+RDATE:19730606T000000
+RDATE:19780430T000000
+RDATE:19850401T000000
+RDATE:19890508T000000
+RDATE:19900427T000000
+RDATE:19910417T000000
+RDATE:19920410T000000
+RDATE:19990701T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19740501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770430T220000Z
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19731001T000000
+RRULE:FREQ=YEARLY;UNTIL=19750930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770430T220000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19860404T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR;UNTIL=19880331T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
+DTSTART:19761101T000000
+RDATE:19761101T000000
+RDATE:19771001T000000
+RDATE:19780930T000000
+RDATE:19851001T000000
+RDATE:19910927T000000
+RDATE:19940916T000000
+RDATE:20031024T010000
+RDATE:20041015T010000
+RDATE:20050930T010000
 TZNAME:EET
-DTSTART:19861003T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1FR;UNTIL=19901004T210000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19921002T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1FR;UNTIL=19930930T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19860404T000000
+RRULE:FREQ=YEARLY;UNTIL=19880331T220000Z;BYDAY=1FR;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19930402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR;UNTIL=19980402T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19861003T000000
+RRULE:FREQ=YEARLY;UNTIL=19901004T210000Z;BYDAY=1FR;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19950915T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3FR;UNTIL=19980917T220000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19921002T000000
+RRULE:FREQ=YEARLY;UNTIL=19930930T210000Z;BYDAY=1FR;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19990930T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1TH;UNTIL=20020925T220000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930402T000000
+RRULE:FREQ=YEARLY;UNTIL=19980402T220000Z;BYDAY=1FR;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:20000330T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1TH
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19950915T010000
+RRULE:FREQ=YEARLY;UNTIL=19980917T220000Z;BYDAY=3FR;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20061027T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1FR
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+022344
+DTSTART:19990924T010000
+RRULE:FREQ=YEARLY;UNTIL=20020926T220000Z;BYDAY=-1FR;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19310101T000000
-RDATE:19310101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20000330T000000
+RRULE:FREQ=YEARLY;UNTIL=20010328T220000Z;BYDAY=-1TH;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20020328T235959
+RRULE:FREQ=YEARLY;BYDAY=-1TH;BYMONTH=3
 TZNAME:EEST
-DTSTART:19730606T000000
-RDATE:19730606T000000
-RDATE:19780430T000000
-RDATE:19850401T000000
-RDATE:19890508T000000
-RDATE:19900427T000000
-RDATE:19910417T000000
-RDATE:19920410T000000
-RDATE:19990701T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20061027T010000
+RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19761101T000000
-RDATE:19761101T000000
-RDATE:19771001T000000
-RDATE:19780930T000000
-RDATE:19851001T000000
-RDATE:19910927T000000
-RDATE:19940916T000000
-RDATE:20031024T010000
-RDATE:20041015T010000
-RDATE:20050930T010000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Anadyr.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Anadyr.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Anadyr.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,127 +1,143 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Anadyr
 X-LIC-LOCATION:Asia/Anadyr
 BEGIN:STANDARD
-TZOFFSETFROM:+1300
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:ANAT
+TZOFFSETFROM:+114956
 TZOFFSETTO:+1200
-TZNAME:ANAT
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T110000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:ANAST
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RDATE:19810401T000000
 TZNAME:ANAST
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T120000Z
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RDATE:19811001T000000
+TZNAME:ANAT
+TZOFFSETFROM:+1400
+TZOFFSETTO:+1300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820401T000000
+RDATE:19820401T000000
+TZNAME:ANAST
 TZOFFSETFROM:+1300
+TZOFFSETTO:+1300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T110000Z;BYMONTH=10
+TZNAME:ANAT
+TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:ANAT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T120000Z;BYMONTH=4
+TZNAME:ANAST
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:ANAST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T140000Z
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T140000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ANAT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T140000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ANAST
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:ANAST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1300
+DTSTART:19910331T020000
+RDATE:19910331T020000
+RDATE:20100328T020000
+TZNAME:ANAST
+TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:ANAT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T140000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
+DTSTART:19910929T030000
+RDATE:19910929T030000
 TZNAME:ANAT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+114956
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:ANAST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:ANAT
-DTSTART:19240502T000000
-RDATE:19240502T000000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:ANAST
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:ANAT
-DTSTART:19300621T000000
-RDATE:19300621T000000
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1400
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20090328T140000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:ANAST
-DTSTART:19810401T000000
-RDATE:19810401T000000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1400
-TZOFFSETTO:+1300
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T140000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:ANAT
-DTSTART:19811001T000000
-RDATE:19811001T000000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1300
-TZOFFSETTO:+1300
-TZNAME:ANAST
-DTSTART:19820401T000000
-RDATE:19820401T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
 TZOFFSETTO:+1200
-TZNAME:ANAST
-DTSTART:19910331T020000
-RDATE:19910331T020000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20091024T140000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:ANAT
-DTSTART:19910929T030000
-RDATE:19910929T030000
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
+DTSTART:20101031T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:ANAT
-DTSTART:19920119T020000
-RDATE:19920119T020000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
+DTSTART:20110327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:ANAST
-DTSTART:19920328T230000
-RDATE:19920328T230000
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:ANAT
-DTSTART:19920926T230000
-RDATE:19920926T230000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtau.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtau.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,142 +1,137 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Aqtau
 X-LIC-LOCATION:Asia/Aqtau
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:FORT
+TZOFFSETFROM:+032104
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:FORT
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19630101T000000
+RDATE:19630101T000000
+RDATE:19910101T000000
 TZNAME:SHET
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RDATE:19811001T000000
+TZNAME:SHET
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820401T000000
+RDATE:19820401T000000
 TZNAME:SHEST
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:SHET
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:SHET
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
 TZNAME:SHEST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:AQTST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T210000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:SHET
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:AQTT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19940924T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:AQTST
-DTSTART:19960331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T220000Z
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:SHEST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19911216T000000
+RDATE:19911216T000000
+RDATE:19950326T020000
+TZNAME:AQTST
 TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:AQTT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20041030T220000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+032104
-TZOFFSETTO:+0400
-TZNAME:FORT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:FORT
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:AQTST
 TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-TZNAME:SHET
-DTSTART:19630101T000000
-RDATE:19630101T000000
-RDATE:19910101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:SHET
-DTSTART:19811001T000000
-RDATE:19811001T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:SHEST
-DTSTART:19820401T000000
-RDATE:19820401T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:AQTT
-DTSTART:19911216T000000
-RDATE:19911216T000000
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=19940326T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:AQTST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:AQTST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19940924T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AQTT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19950924T030000
+RDATE:19950924T030000
 TZNAME:AQTT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
+DTSTART:19960331T020000
+RRULE:FREQ=YEARLY;UNTIL=20040327T220000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:AQTST
-DTSTART:19950326T020000
-RDATE:19950326T020000
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20041030T220000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AQTT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:AQTT
-DTSTART:19950924T030000
-RDATE:19950924T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:AQTT
 DTSTART:20050315T000000
 RDATE:20050315T000000
+TZNAME:AQTT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtobe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtobe.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtobe.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,121 +1,128 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Aqtobe
 X-LIC-LOCATION:Asia/Aqtobe
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:AKTT
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+TZOFFSETFROM:+034840
+TZOFFSETTO:+0400
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-TZNAME:AKTST
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:AKTT
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:AKTT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
+BEGIN:STANDARD
+DTSTART:19810401T000000
+RDATE:19810401T000000
 TZNAME:AKTST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:AQTST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T210000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RDATE:19811001T000000
+TZNAME:AKTT
 TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-TZNAME:AQTT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
+TZOFFSETTO:+0600
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19820401T000000
+RDATE:19820401T000000
+TZNAME:AKTST
 TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-TZNAME:AQTT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20041030T210000Z
+TZOFFSETTO:+0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+034840
-TZOFFSETTO:+0400
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
 TZNAME:AKTT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:AKTT
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:AKTST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:AKTST
-DTSTART:19810401T000000
-RDATE:19810401T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AKTT
 TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:AKTT
-DTSTART:19811001T000000
-RDATE:19811001T000000
+TZOFFSETTO:+0500
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:AKTST
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:AKTST
-DTSTART:19820401T000000
-RDATE:19820401T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+TZNAME:AKTT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:AKTT
-DTSTART:19910101T000000
-RDATE:19910101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19911216T000000
+RDATE:19911216T000000
+TZNAME:AQTST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:AQTST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:AQTT
-DTSTART:19911216T000000
-RDATE:19911216T000000
-RDATE:20050315T000000
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20040327T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:AQTST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:AQTST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AQTT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20041030T210000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:AQTT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:20050315T000000
+RDATE:20050315T000000
+TZNAME:AQTT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ashgabat.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ashgabat.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ashgabat.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,78 +1,79 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Ashgabat
 X-LIC-LOCATION:Asia/Ashgabat
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-TZNAME:ASHST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:ASHT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+TZOFFSETFROM:+035332
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:ASHST
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:ASHT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:ASHST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:ASHST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+035332
-TZOFFSETTO:+0400
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
 TZNAME:ASHT
-DTSTART:19240502T000000
-RDATE:19240502T000000
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ASHT
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:ASHT
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ASHST
 TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-TZNAME:ASHST
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
+TZNAME:ASHST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:ASHT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:ASHT
-DTSTART:19910929T030000
-RDATE:19910929T030000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19911027T000000
+RDATE:19911027T000000
+TZNAME:TMST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:TMT
-DTSTART:19911027T000000
-RDATE:19911027T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:TMT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:TMT
-DTSTART:19920119T020000
-RDATE:19920119T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ashkhabad.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ashkhabad.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ashkhabad.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,78 +1,79 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Ashkhabad
 X-LIC-LOCATION:Asia/Ashkhabad
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-TZNAME:ASHST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:ASHT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+TZOFFSETFROM:+035332
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:ASHST
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:ASHT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:ASHST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:ASHST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+035332
-TZOFFSETTO:+0400
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
 TZNAME:ASHT
-DTSTART:19240502T000000
-RDATE:19240502T000000
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ASHT
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:ASHT
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ASHST
 TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-TZNAME:ASHST
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
+TZNAME:ASHST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:ASHT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:ASHT
-DTSTART:19910929T030000
-RDATE:19910929T030000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19911027T000000
+RDATE:19911027T000000
+TZNAME:TMST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:TMT
-DTSTART:19911027T000000
-RDATE:19911027T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:TMT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:TMT
-DTSTART:19920119T020000
-RDATE:19920119T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baghdad.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baghdad.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baghdad.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,72 +1,73 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Baghdad
 X-LIC-LOCATION:Asia/Baghdad
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:BMT
+TZOFFSETFROM:+025740
+TZOFFSETTO:+025736
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+TZNAME:AST
+TZOFFSETFROM:+025736
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19840930T200000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19820501T000000
+RDATE:19820501T000000
+RDATE:19830331T000000
+TZNAME:ADT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:ADT
-DTSTART:19840401T000000
-RRULE:FREQ=YEARLY;UNTIL=19850331T210000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19840930T200000Z;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19850929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T220000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
+DTSTART:19840401T000000
+RRULE:FREQ=YEARLY;UNTIL=19850331T210000Z;BYMONTH=4
 TZNAME:ADT
-DTSTART:19860330T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T220000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:ADT
-DTSTART:19910401T030000
-RRULE:FREQ=YEARLY;UNTIL=20070401T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19850929T020000
+RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19911001T040000
-RRULE:FREQ=YEARLY;UNTIL=20071001T000000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+025740
-TZOFFSETTO:+025736
-TZNAME:BMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+025736
-TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19180101T000000
-RDATE:19180101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19860330T010000
+RRULE:FREQ=YEARLY;UNTIL=19900324T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ADT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19910401T030000
+RRULE:FREQ=YEARLY;UNTIL=20070401T000000Z;BYMONTH=4
 TZNAME:ADT
-DTSTART:19820501T000000
-RDATE:19820501T000000
-RDATE:19830331T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911001T040000
+RRULE:FREQ=YEARLY;UNTIL=20071001T000000Z;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bahrain.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bahrain.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bahrain.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Bahrain
 X-LIC-LOCATION:Asia/Bahrain
 BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:GST
 TZOFFSETFROM:+032220
 TZOFFSETTO:+0400
-TZNAME:GST
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19720601T000000
+RDATE:19720601T000000
+TZNAME:AST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19720601T000000
-RDATE:19720601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baku.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baku.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baku.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,120 +1,116 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Baku
 X-LIC-LOCATION:Asia/Baku
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:BAKST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:BAKT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
+TZOFFSETFROM:+031924
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
+DTSTART:19570301T000000
+RDATE:19570301T000000
+TZNAME:BAKST
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:BAKT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T220000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
 TZNAME:BAKST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-TZNAME:AZT
-DTSTART:19960101T000000
-RRULE:FREQ=YEARLY;UNTIL=19961231T200000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:AZST
-DTSTART:19970330T040000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:BAKT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:AZT
-DTSTART:19971026T050000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+031924
-TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:BAKT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:BAKT
-DTSTART:19570301T000000
-RDATE:19570301T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T220000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:BAKST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+TZNAME:BAKST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:AZST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19910830T000000
 RDATE:19910830T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+RDATE:19960101T000000
+RDATE:19970101T000000
+TZNAME:AZST
 TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:AZT
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19910929T030000
 RDATE:19910929T030000
+TZNAME:AZT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:AZST
 DTSTART:19920328T230000
 RDATE:19920328T230000
+TZNAME:AZST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-TZNAME:AZT
 DTSTART:19920926T230000
 RDATE:19920926T230000
+TZNAME:AZT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:AZST
 DTSTART:19960331T050000
 RDATE:19960331T050000
+TZNAME:AZST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T060000
+RDATE:19961027T060000
+TZNAME:AZT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:AZST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19971026T050000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:AZT
-DTSTART:19961027T060000
-RDATE:19961027T060000
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bangkok.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bangkok.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bangkok.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Bangkok
 X-LIC-LOCATION:Asia/Bangkok
 BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:BMT
 TZOFFSETFROM:+064204
 TZOFFSETTO:+064204
-TZNAME:BMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19200401T000000
+RDATE:19200401T000000
+TZNAME:ICT
 TZOFFSETFROM:+064204
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19200401T000000
-RDATE:19200401T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Beirut.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Beirut.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Beirut.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,111 +1,112 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Beirut
 X-LIC-LOCATION:Asia/Beirut
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0222
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200328T000000
+RDATE:19200328T000000
+RDATE:19210403T000000
+RDATE:19220326T000000
+RDATE:19230422T000000
+RDATE:19720622T000000
+RDATE:19780430T000000
+RDATE:19880601T000000
+RDATE:19890510T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201025T000000
+RDATE:19201025T000000
+RDATE:19211003T000000
+RDATE:19221008T000000
+RDATE:19230916T000000
+RDATE:19780930T000000
+RDATE:19921004T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19570501T000000
+RRULE:FREQ=YEARLY;UNTIL=19610430T220000Z;BYMONTH=5
 TZNAME:EEST
-DTSTART:19570501T000000
-RRULE:FREQ=YEARLY;UNTIL=19610430T220000Z
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19571001T000000
+RRULE:FREQ=YEARLY;UNTIL=19610930T210000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19571001T000000
-RRULE:FREQ=YEARLY;UNTIL=19610930T210000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19721001T000000
+RRULE:FREQ=YEARLY;UNTIL=19770930T210000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19721001T000000
-RRULE:FREQ=YEARLY;UNTIL=19770930T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19730501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770430T220000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19730501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770430T220000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19840501T000000
+RRULE:FREQ=YEARLY;UNTIL=19870430T220000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19840501T000000
-RRULE:FREQ=YEARLY;UNTIL=19870430T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19841016T000000
+RRULE:FREQ=YEARLY;UNTIL=19911015T210000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19841016T000000
-RRULE:FREQ=YEARLY;UNTIL=19911015T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19900501T000000
+RRULE:FREQ=YEARLY;UNTIL=19920430T220000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19900501T000000
-RRULE:FREQ=YEARLY;UNTIL=19920430T220000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19930328T000000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19930328T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T000000
+RRULE:FREQ=YEARLY;UNTIL=19980926T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19930926T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19980926T210000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19991031T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0222
-TZOFFSETTO:+0200
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:EET
-DTSTART:18800101T000000
-RDATE:18800101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19200328T000000
-RDATE:19200328T000000
-RDATE:19210403T000000
-RDATE:19220326T000000
-RDATE:19230422T000000
-RDATE:19720622T000000
-RDATE:19780430T000000
-RDATE:19880601T000000
-RDATE:19890510T000000
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19201025T000000
-RDATE:19201025T000000
-RDATE:19211003T000000
-RDATE:19221008T000000
-RDATE:19230916T000000
-RDATE:19780930T000000
-RDATE:19921004T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bishkek.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bishkek.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bishkek.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,99 +1,101 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Bishkek
 X-LIC-LOCATION:Asia/Bishkek
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:FRUT
+TZOFFSETFROM:+045824
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:FRUST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z;BYMONTH=4
+TZNAME:FRUST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:FRUST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
+TZNAME:FRUT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:FRUT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:FRUT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:FRUT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:FRUST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
 TZNAME:FRUST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910831T020000
+RDATE:19910831T020000
 TZNAME:KGST
-DTSTART:19920412T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=7,8,9,10,11,12,13;BYDAY=SU;UNTIL=19960406T190000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:KGT
-DTSTART:19920927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19960928T180000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920412T000000
+RRULE:FREQ=YEARLY;UNTIL=19960406T190000Z;BYDAY=SU;BYMONTHDAY=7,8,9,10,11,1
+ 2,13;BYMONTH=4
+TZNAME:KGST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:KGST
-DTSTART:19970330T023000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T213000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;UNTIL=19960928T180000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KGT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:KGT
-DTSTART:19971026T023000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20041030T203000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+045824
-TZOFFSETTO:+0500
-TZNAME:FRUT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T023000
+RRULE:FREQ=YEARLY;UNTIL=20050326T213000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:KGST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:FRUT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:FRUST
-DTSTART:19910331T020000
-RDATE:19910331T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19971026T023000
+RRULE:FREQ=YEARLY;UNTIL=20041030T203000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:KGT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:KGT
-DTSTART:19910831T020000
-RDATE:19910831T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20050812T000000
+RDATE:20050812T000000
+TZNAME:KGT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:KGT
-DTSTART:20050812T000000
-RDATE:20050812T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Brunei.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Brunei.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Brunei.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Brunei
 X-LIC-LOCATION:Asia/Brunei
 BEGIN:STANDARD
+DTSTART:19260301T000000
+RDATE:19260301T000000
+TZNAME:BNT
 TZOFFSETFROM:+073940
 TZOFFSETTO:+0730
-TZNAME:BNT
-DTSTART:19260301T000000
-RDATE:19260301T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+TZNAME:BNT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:BNT
-DTSTART:19330101T000000
-RDATE:19330101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Calcutta.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Calcutta.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Calcutta.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,37 +1,38 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Calcutta
 X-LIC-LOCATION:Asia/Calcutta
 BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:HMT
 TZOFFSETFROM:+055328
 TZOFFSETTO:+055320
-TZNAME:HMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19411001T000000
+RDATE:19411001T000000
+TZNAME:BURT
 TZOFFSETFROM:+055320
 TZOFFSETTO:+0630
-TZNAME:BURT
-DTSTART:19411001T000000
-RDATE:19411001T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0530
-TZNAME:IST
 DTSTART:19420515T000000
 RDATE:19420515T000000
 RDATE:19451015T000000
+TZNAME:IST
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:IST
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0630
-TZNAME:IST
-DTSTART:19420901T000000
-RDATE:19420901T000000
-END:DAYLIGHT
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Choibalsan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Choibalsan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Choibalsan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,78 +1,86 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Choibalsan
 X-LIC-LOCATION:Asia/Choibalsan
 BEGIN:STANDARD
+DTSTART:19050801T000000
+RDATE:19050801T000000
+TZNAME:ULAT
+TZOFFSETFROM:+0738
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19780101T000000
+RDATE:19780101T000000
+TZNAME:ULAT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RDATE:19830401T000000
+TZNAME:CHOST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19831001T000000
+RDATE:19831001T000000
+TZNAME:CHOT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+0900
-TZNAME:CHOT
-DTSTART:19840930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19980926T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19840401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T150000Z;BYMONTH=4
+TZNAME:CHOST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+1000
-TZNAME:CHOST
-DTSTART:19850331T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T150000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19840930T000000
+RRULE:FREQ=YEARLY;UNTIL=19980926T140000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CHOT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+0900
-TZNAME:CHOT
-DTSTART:20010929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20060929T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T000000
+RRULE:FREQ=YEARLY;UNTIL=19980328T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CHOST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+1000
-TZNAME:CHOST
-DTSTART:20020330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20060324T170000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0738
-TZOFFSETTO:+0700
-TZNAME:ULAT
-DTSTART:19050801T000000
-RDATE:19050801T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-TZNAME:ULAT
-DTSTART:19780101T000000
-RDATE:19780101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
+DTSTART:20010428T020000
+RDATE:20010428T020000
+TZNAME:CHOST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+1000
-TZNAME:CHOST
-DTSTART:19830401T000000
-RDATE:19830401T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;UNTIL=20060929T160000Z;BYDAY=-1SA;BYMONTH=9
+TZNAME:CHOT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+0900
-TZNAME:CHOT
-DTSTART:19831001T000000
-RDATE:19831001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;UNTIL=20060324T170000Z;BYDAY=-1SA;BYMONTH=3
+TZNAME:CHOST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+1000
-TZNAME:CHOST
-DTSTART:19840401T000000
-RDATE:19840401T000000
-RDATE:20010428T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080331T000000
+RDATE:20080331T000000
+TZNAME:CHOST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-DTSTART:20080331T000000
-RDATE:20080331T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chongqing.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chongqing.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chongqing.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,45 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Chongqing
 X-LIC-LOCATION:Asia/Chongqing
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:LONT
+TZOFFSETFROM:+070620
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800501T000000
+RDATE:19800501T000000
+TZNAME:CST
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19860914T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19910914T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19860504T000000
+RDATE:19860504T000000
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19870412T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=10,11,12,13,14,15,16;BYDAY=SU;UNTIL=19910413T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+070620
-TZOFFSETTO:+0700
-TZNAME:LONT
-DTSTART:19280101T000000
-RDATE:19280101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;UNTIL=19910914T150000Z;BYDAY=SU;BYMONTHDAY=11,12,13,14,1
+ 5,16,17;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19800501T000000
-RDATE:19800501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870412T000000
+RRULE:FREQ=YEARLY;UNTIL=19910413T160000Z;BYDAY=-3SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19860504T000000
-RDATE:19860504T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chungking.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chungking.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chungking.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,45 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Chungking
 X-LIC-LOCATION:Asia/Chungking
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:LONT
+TZOFFSETFROM:+070620
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800501T000000
+RDATE:19800501T000000
+TZNAME:CST
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19860914T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19910914T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19860504T000000
+RDATE:19860504T000000
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19870412T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=10,11,12,13,14,15,16;BYDAY=SU;UNTIL=19910413T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+070620
-TZOFFSETTO:+0700
-TZNAME:LONT
-DTSTART:19280101T000000
-RDATE:19280101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;UNTIL=19910914T150000Z;BYDAY=SU;BYMONTHDAY=11,12,13,14,1
+ 5,16,17;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19800501T000000
-RDATE:19800501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870412T000000
+RRULE:FREQ=YEARLY;UNTIL=19910413T160000Z;BYDAY=-3SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19860504T000000
-RDATE:19860504T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Colombo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Colombo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Colombo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,65 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Colombo
 X-LIC-LOCATION:Asia/Colombo
 BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
 TZOFFSETFROM:+051924
 TZOFFSETTO:+051932
-TZNAME:MMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19060101T000000
+RDATE:19060101T000000
+TZNAME:IST
 TZOFFSETFROM:+051932
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19060101T000000
-RDATE:19060101T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19420105T000000
+RDATE:19420105T000000
+TZNAME:IHST
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0600
-TZNAME:IHST
-DTSTART:19420105T000000
-RDATE:19420105T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:IST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451016T020000
+RDATE:19451016T020000
 TZNAME:IST
-DTSTART:19420901T000000
-RDATE:19420901T000000
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0630
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19451016T020000
-RDATE:19451016T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19960525T000000
+RDATE:19960525T000000
+TZNAME:LKT
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0630
-TZNAME:LKT
-DTSTART:19960525T000000
-RDATE:19960525T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19961026T003000
+RDATE:19961026T003000
+TZNAME:LKT
 TZOFFSETFROM:+0630
 TZOFFSETTO:+0600
-TZNAME:LKT
-DTSTART:19961026T003000
-RDATE:19961026T003000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20060415T003000
+RDATE:20060415T003000
+TZNAME:IST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:20060415T003000
-RDATE:20060415T003000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dacca.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dacca.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dacca.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,50 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Dacca
 X-LIC-LOCATION:Asia/Dacca
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:HMT
 TZOFFSETFROM:+060140
 TZOFFSETTO:+055320
-TZNAME:HMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19411001T000000
+RDATE:19411001T000000
+TZNAME:BURT
 TZOFFSETFROM:+055320
 TZOFFSETTO:+0630
-TZNAME:BURT
-DTSTART:19411001T000000
-RDATE:19411001T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420515T000000
+RDATE:19420515T000000
+TZNAME:IST
 TZOFFSETFROM:+0630
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19420515T000000
-RDATE:19420515T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:BURT
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0630
-TZNAME:BURT
-DTSTART:19420901T000000
-RDATE:19420901T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510930T000000
+RDATE:19510930T000000
+TZNAME:DACT
 TZOFFSETFROM:+0630
 TZOFFSETTO:+0600
-TZNAME:DACT
-DTSTART:19510930T000000
-RDATE:19510930T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19710326T000000
+RDATE:19710326T000000
+TZNAME:BDT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20090101T000000
+RDATE:20090101T000000
+TZNAME:BDST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20090619T230000
+RDATE:20090619T230000
+TZNAME:BDST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20091231T235900
+RDATE:20091231T235900
 TZNAME:BDT
-DTSTART:19710326T000000
-RDATE:19710326T000000
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Damascus.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Damascus.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Damascus.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,160 +1,164 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Damascus
 X-LIC-LOCATION:Asia/Damascus
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:EEST
+TZOFFSETFROM:+022512
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200418T020000
+RRULE:FREQ=YEARLY;UNTIL=19230415T000000Z;BYDAY=3SU;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201003T020000
+RRULE:FREQ=YEARLY;UNTIL=19231006T230000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19620429T020000
+RDATE:19620429T020000
+RDATE:19660424T020000
+RDATE:19860216T020000
+RDATE:19870301T020000
+RDATE:19880315T020000
+RDATE:19890331T020000
+RDATE:19900401T020000
+RDATE:19910401T000000
+RDATE:19920408T000000
+RDATE:19930326T000000
+RDATE:20070330T000000
+RDATE:20080404T000000
+RDATE:20090327T000000
 TZNAME:EEST
-DTSTART:19200418T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19230415T000000Z
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19621001T020000
+RDATE:19621001T020000
+RDATE:19630930T020000
+RDATE:19641001T020000
+RDATE:19650930T020000
+RDATE:19861009T020000
+RDATE:19891001T020000
+RDATE:19900930T020000
+RDATE:19930925T000000
+RDATE:20060922T000000
+RDATE:20071102T000000
+RDATE:20081101T000000
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19201003T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19231006T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19630501T020000
+RRULE:FREQ=YEARLY;UNTIL=19650501T000000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19630501T020000
-RRULE:FREQ=YEARLY;UNTIL=19650501T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19661001T020000
+RRULE:FREQ=YEARLY;UNTIL=19760930T230000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19661001T020000
-RRULE:FREQ=YEARLY;UNTIL=19760930T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670501T020000
+RRULE:FREQ=YEARLY;UNTIL=19780501T000000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19670501T020000
-RRULE:FREQ=YEARLY;UNTIL=19780501T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19770901T020000
+RRULE:FREQ=YEARLY;UNTIL=19780831T230000Z;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19770901T020000
-RRULE:FREQ=YEARLY;UNTIL=19780831T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830409T020000
+RRULE:FREQ=YEARLY;UNTIL=19840409T000000Z;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19830409T020000
-RRULE:FREQ=YEARLY;UNTIL=19840409T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19831001T020000
+RRULE:FREQ=YEARLY;UNTIL=19840930T230000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19831001T020000
-RRULE:FREQ=YEARLY;UNTIL=19840930T230000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19871031T020000
+RRULE:FREQ=YEARLY;UNTIL=19881030T230000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19871031T020000
-RRULE:FREQ=YEARLY;UNTIL=19881030T230000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19911001T000000
+RRULE:FREQ=YEARLY;UNTIL=19920930T210000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19911001T000000
-RRULE:FREQ=YEARLY;UNTIL=19920930T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19940401T000000
+RRULE:FREQ=YEARLY;UNTIL=19960331T220000Z;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19940401T000000
-RRULE:FREQ=YEARLY;UNTIL=19960331T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19941001T000000
+RRULE:FREQ=YEARLY;UNTIL=20050930T210000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19941001T000000
-RRULE:FREQ=YEARLY;UNTIL=20050930T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19970331T000000
+RRULE:FREQ=YEARLY;UNTIL=19980329T220000Z;BYDAY=-1MO;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19970331T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1MO;UNTIL=19980329T220000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
+DTSTART:19990401T000000
+RRULE:FREQ=YEARLY;UNTIL=20060331T220000Z;BYMONTH=4
 TZNAME:EEST
-DTSTART:19990401T000000
-RRULE:FREQ=YEARLY;UNTIL=20060331T220000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:20080404T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20091030T000000
+RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20081101T000000
-RRULE:FREQ=YEARLY
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+022512
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19200101T000000
-RDATE:19200101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20100402T000000
+RRULE:FREQ=YEARLY;BYDAY=1FR;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19620429T020000
-RDATE:19620429T020000
-RDATE:19660424T020000
-RDATE:19860216T020000
-RDATE:19870301T020000
-RDATE:19880315T020000
-RDATE:19890331T020000
-RDATE:19900401T020000
-RDATE:19910401T000000
-RDATE:19920408T000000
-RDATE:19930326T000000
-RDATE:20070330T000000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19621001T020000
-RDATE:19621001T020000
-RDATE:19630930T020000
-RDATE:19641001T020000
-RDATE:19650930T020000
-RDATE:19861009T020000
-RDATE:19891001T020000
-RDATE:19900930T020000
-RDATE:19930925T000000
-RDATE:20060922T000000
-RDATE:20071102T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dhaka.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dhaka.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dhaka.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,50 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Dhaka
 X-LIC-LOCATION:Asia/Dhaka
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:HMT
 TZOFFSETFROM:+060140
 TZOFFSETTO:+055320
-TZNAME:HMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19411001T000000
+RDATE:19411001T000000
+TZNAME:BURT
 TZOFFSETFROM:+055320
 TZOFFSETTO:+0630
-TZNAME:BURT
-DTSTART:19411001T000000
-RDATE:19411001T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420515T000000
+RDATE:19420515T000000
+TZNAME:IST
 TZOFFSETFROM:+0630
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19420515T000000
-RDATE:19420515T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:BURT
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0630
-TZNAME:BURT
-DTSTART:19420901T000000
-RDATE:19420901T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510930T000000
+RDATE:19510930T000000
+TZNAME:DACT
 TZOFFSETFROM:+0630
 TZOFFSETTO:+0600
-TZNAME:DACT
-DTSTART:19510930T000000
-RDATE:19510930T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19710326T000000
+RDATE:19710326T000000
+TZNAME:BDT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20090101T000000
+RDATE:20090101T000000
+TZNAME:BDST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20090619T230000
+RDATE:20090619T230000
+TZNAME:BDST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20091231T235900
+RDATE:20091231T235900
 TZNAME:BDT
-DTSTART:19710326T000000
-RDATE:19710326T000000
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dili.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dili.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dili.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Dili
 X-LIC-LOCATION:Asia/Dili
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:TLT
 TZOFFSETFROM:+082220
 TZOFFSETTO:+0800
-TZNAME:TLT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420221T230000
+RDATE:19420221T230000
+TZNAME:JST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420221T230000
-RDATE:19420221T230000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:TLT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:TLT
-DTSTART:19450923T000000
-RDATE:19450923T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19760503T000000
+RDATE:19760503T000000
+TZNAME:CIT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CIT
-DTSTART:19760503T000000
-RDATE:19760503T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20000917T000000
+RDATE:20000917T000000
+TZNAME:TLT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:TLT
-DTSTART:20000917T000000
-RDATE:20000917T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dubai.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dubai.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dubai.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Dubai
 X-LIC-LOCATION:Asia/Dubai
 BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:GST
 TZOFFSETFROM:+034112
 TZOFFSETTO:+0400
-TZNAME:GST
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dushanbe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dushanbe.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dushanbe.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,65 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Dushanbe
 X-LIC-LOCATION:Asia/Dushanbe
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-TZNAME:DUSST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:DUST
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
+TZOFFSETFROM:+043512
+TZOFFSETTO:+0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:DUSST
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:DUST
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z;BYMONTH=4
+TZNAME:DUSST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:DUSST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+043512
-TZOFFSETTO:+0500
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
 TZNAME:DUST
-DTSTART:19240502T000000
-RDATE:19240502T000000
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:DUST
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:DUST
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:DUSST
 TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:DUSST
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
+TZNAME:DUSST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910909T030000
+RDATE:19910909T030000
+TZNAME:TJT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:TJT
-DTSTART:19910909T030000
-RDATE:19910909T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Gaza.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Gaza.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Gaza.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,108 +1,36 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Gaza
 X-LIC-LOCATION:Asia/Gaza
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
+DTSTART:19001001T000000
+RDATE:19001001T000000
 TZNAME:EET
-DTSTART:19421101T000000
-RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19571001T000000
-RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19590501T010000
-RRULE:FREQ=YEARLY;UNTIL=19670430T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19590930T030000
-RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19880903T000000
-RRULE:FREQ=YEARLY;UNTIL=19890902T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19960405T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1FR;UNTIL=19980402T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19960920T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3FR;UNTIL=19980917T220000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19990416T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3FR;UNTIL=20050414T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19991015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3FR;UNTIL=20031016T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:20060401T000000
-RRULE:FREQ=YEARLY
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20080828T020000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYDAY=-1TH
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+021752
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19001001T000000
-RDATE:19001001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EET
 DTSTART:19400601T000000
 RDATE:19400601T000000
 RDATE:19430401T020000
 RDATE:19440401T000000
 RDATE:19450416T000000
 RDATE:19460416T020000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421101T000000
+RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z;BYMONTH=11
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19451101T020000
 RDATE:19451101T020000
 RDATE:19461101T000000
@@ -111,28 +39,53 @@
 RDATE:20051004T020000
 RDATE:20060922T000000
 RDATE:20070913T020000
+RDATE:20080829T020000
+RDATE:20090904T020000
+RDATE:20100811T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19480515T000000
 RDATE:19480515T000000
 RDATE:19960101T000000
 RDATE:19990101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
 DTSTART:19570510T000000
 RDATE:19570510T000000
 RDATE:19580501T000000
+RDATE:20090327T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19571001T000000
+RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:IST
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19590501T010000
+RRULE:FREQ=YEARLY;UNTIL=19670430T230000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19590930T030000
+RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19670605T000000
 RDATE:19670605T000000
 RDATE:19741013T000000
@@ -140,17 +93,19 @@
 RDATE:19850915T000000
 RDATE:19860907T000000
 RDATE:19870913T000000
+RDATE:19880903T000000
+RDATE:19890903T000000
 RDATE:19900826T000000
 RDATE:19910901T000000
 RDATE:19920906T000000
 RDATE:19930905T000000
 RDATE:19940828T000000
 RDATE:19950903T000000
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
 DTSTART:19740707T000000
 RDATE:19740707T000000
 RDATE:19750420T000000
@@ -165,6 +120,65 @@
 RDATE:19930402T000000
 RDATE:19940401T000000
 RDATE:19950331T000000
+TZNAME:IDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19960405T000000
+RRULE:FREQ=YEARLY;UNTIL=19980402T220000Z;BYDAY=1FR;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19960920T010000
+RRULE:FREQ=YEARLY;UNTIL=19980917T220000Z;BYDAY=3FR;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19990416T000000
+RRULE:FREQ=YEARLY;UNTIL=20050414T220000Z;BYDAY=3FR;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19991015T000000
+RRULE:FREQ=YEARLY;UNTIL=20031016T210000Z;BYDAY=3FR;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20060401T000000
+RRULE:FREQ=YEARLY;UNTIL=20080331T220000Z;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20100327T000100
+RRULE:FREQ=YEARLY;BYDAY=-1SA;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20100903T020000
+RDATE:20100903T020000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110902T020000
+RRULE:FREQ=YEARLY;BYDAY=1FR;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Harbin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Harbin.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Harbin.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,58 +1,60 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Harbin
 X-LIC-LOCATION:Asia/Harbin
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19860914T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19910914T150000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19870412T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=10,11,12,13,14,15,16;BYDAY=SU;UNTIL=19910413T160000Z
-END:DAYLIGHT
-BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:CHAT
 TZOFFSETFROM:+082644
 TZOFFSETTO:+0830
-TZNAME:CHAT
-DTSTART:19280101T000000
-RDATE:19280101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0830
-TZOFFSETTO:+0800
-TZNAME:CST
 DTSTART:19320301T000000
 RDATE:19320301T000000
 RDATE:19800501T000000
+TZNAME:CST
+TZOFFSETFROM:+0830
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19400101T000000
+RDATE:19400101T000000
+TZNAME:CHAT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CHAT
-DTSTART:19400101T000000
-RDATE:19400101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19660501T000000
+RDATE:19660501T000000
+TZNAME:CHAT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0830
-TZNAME:CHAT
-DTSTART:19660501T000000
-RDATE:19660501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19860504T000000
+RDATE:19860504T000000
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;UNTIL=19910914T150000Z;BYDAY=SU;BYMONTHDAY=11,12,13,14,1
+ 5,16,17;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870412T000000
+RRULE:FREQ=YEARLY;UNTIL=19910413T160000Z;BYDAY=-3SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19860504T000000
-RDATE:19860504T000000
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ho_Chi_Minh.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ho_Chi_Minh.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ho_Chi_Minh.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Ho_Chi_Minh
 X-LIC-LOCATION:Asia/Ho_Chi_Minh
 BEGIN:STANDARD
+DTSTART:19060609T000000
+RDATE:19060609T000000
+TZNAME:SMT
 TZOFFSETFROM:+070640
 TZOFFSETTO:+070620
-TZNAME:SMT
-DTSTART:19060609T000000
-RDATE:19060609T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:ICT
 TZOFFSETFROM:+070620
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19110311T000100
-RDATE:19110311T000100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120501T000000
+RDATE:19120501T000000
+TZNAME:ICT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:ICT
-DTSTART:19120501T000000
-RDATE:19120501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19310501T000000
+RDATE:19310501T000000
+TZNAME:ICT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19310501T000000
-RDATE:19310501T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hong_Kong.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hong_Kong.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hong_Kong.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,90 +1,114 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Hong_Kong
 X-LIC-LOCATION:Asia/Hong_Kong
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+DTSTART:19041030T000000
+RDATE:19041030T000000
+TZNAME:HKST
+TZOFFSETFROM:+073636
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19481031T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19521025T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
+DTSTART:19410401T033000
+RDATE:19410401T033000
+RDATE:19460420T033000
+RDATE:19470413T033000
+RDATE:19480502T033000
+RDATE:19731230T033000
+RDATE:19790513T033000
 TZNAME:HKST
-DTSTART:19490403T033000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19530404T193000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:HKST
-DTSTART:19540321T033000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=18,19,20,21,22,23,24;BYDAY=SU;UNTIL=19640321T193000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19410930T033000
+RDATE:19410930T033000
+RDATE:19461201T033000
+RDATE:19471230T033000
+RDATE:19521025T033000
+RDATE:19531101T033000
+RDATE:19541031T033000
+RDATE:19791021T033000
+TZNAME:HKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19551106T033000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=19641031T183000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19411225T000000
+RDATE:19411225T000000
+TZNAME:JST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450915T000000
+RDATE:19450915T000000
 TZNAME:HKST
-DTSTART:19650418T033000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19770416T193000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19481031T033000
+RRULE:FREQ=YEARLY;UNTIL=19511027T183000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:HKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19651017T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19771015T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19490403T033000
+RRULE:FREQ=YEARLY;UNTIL=19530404T193000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:HKST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19540321T033000
+RRULE:FREQ=YEARLY;UNTIL=19640321T193000Z;BYDAY=-2SU;BYMONTH=3
 TZNAME:HKST
-DTSTART:19790513T033000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19800510T193000Z
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19551106T033000
+RRULE:FREQ=YEARLY;UNTIL=19641031T183000Z;BYDAY=1SU;BYMONTH=11
+TZNAME:HKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19791021T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19801018T183000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+073636
-TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19041030T000000
-RDATE:19041030T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19650418T033000
+RRULE:FREQ=YEARLY;UNTIL=19730421T193000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:HKST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:HKST
-DTSTART:19460420T033000
-RDATE:19460420T033000
-RDATE:19470413T033000
-RDATE:19480502T033000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651017T033000
+RRULE:FREQ=YEARLY;UNTIL=19761016T183000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=10
+TZNAME:HKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19461201T033000
-RDATE:19461201T033000
-RDATE:19471230T033000
-RDATE:19531101T033000
-RDATE:19541031T033000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740421T033000
+RDATE:19740421T033000
+TZNAME:HKST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19750420T033000
+RRULE:FREQ=YEARLY;UNTIL=19760417T193000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:HKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hovd.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hovd.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hovd.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,71 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Hovd
 X-LIC-LOCATION:Asia/Hovd
+BEGIN:STANDARD
+DTSTART:19050801T000000
+RDATE:19050801T000000
+TZNAME:HOVT
+TZOFFSETFROM:+060636
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19780101T000000
+RDATE:19780101T000000
+TZNAME:HOVST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z;BYMONTH=4
+TZNAME:HOVST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:HOVST
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19831001T000000
+RDATE:19831001T000000
+TZNAME:HOVT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T000000
+RRULE:FREQ=YEARLY;UNTIL=19980926T160000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:HOVT
-DTSTART:19840930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19980926T160000Z
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T000000
+RRULE:FREQ=YEARLY;UNTIL=19980328T170000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:HOVST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:HOVST
-DTSTART:19850331T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T170000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-TZNAME:HOVT
-DTSTART:20010929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20060929T180000Z
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010428T020000
+RDATE:20010428T020000
+TZNAME:HOVST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:HOVST
-DTSTART:20020330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20060324T190000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+060636
-TZOFFSETTO:+0600
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;UNTIL=20060929T180000Z;BYDAY=-1SA;BYMONTH=9
 TZNAME:HOVT
-DTSTART:19050801T000000
-RDATE:19050801T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-TZNAME:HOVT
-DTSTART:19780101T000000
-RDATE:19780101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:HOVT
-DTSTART:19831001T000000
-RDATE:19831001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;UNTIL=20060324T190000Z;BYDAY=-1SA;BYMONTH=3
+TZNAME:HOVST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:HOVST
-DTSTART:20010428T020000
-RDATE:20010428T020000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Irkutsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Irkutsk.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Irkutsk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,107 +1,108 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Irkutsk
 X-LIC-LOCATION:Asia/Irkutsk
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:IMT
+TZOFFSETFROM:+065720
+TZOFFSETTO:+065720
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200125T000000
+RDATE:19200125T000000
+TZNAME:IRKT
+TZOFFSETFROM:+065720
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:IRKST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T160000Z;BYMONTH=4
+TZNAME:IRKST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:IRKST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T150000Z;BYMONTH=10
+TZNAME:IRKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:IRKT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T150000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T180000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:IRKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:IRKT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T180000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T180000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:IRKST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T180000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:IRKST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:IRKST
+TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:IRKT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T180000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
+DTSTART:19910929T030000
+RDATE:19910929T030000
 TZNAME:IRKT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+065720
-TZOFFSETTO:+065720
-TZNAME:IMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+065720
+TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:IRKT
-DTSTART:19200125T000000
-RDATE:19200125T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-TZNAME:IRKT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19920119T020000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:IRKST
 TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-TZNAME:IRKST
-DTSTART:19910331T020000
-RDATE:19910331T020000
+TZOFFSETTO:+0900
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:IRKT
-DTSTART:19910929T030000
-RDATE:19910929T030000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:IRKST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:IRKST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T180000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:IRKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:IRKT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Istanbul.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Istanbul.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Istanbul.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,139 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Istanbul
 X-LIC-LOCATION:Asia/Istanbul
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19241001T000000
-RRULE:FREQ=YEARLY;UNTIL=19250930T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19470420T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19480417T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19471005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19501007T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19700503T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19720506T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701004T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19721007T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19751026T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19761030T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19770403T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19780401T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:TRT
-DTSTART:19791015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=MO;UNTIL=19821010T200000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:TRST
-DTSTART:19810329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19860330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900325T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19860928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900930T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19910331T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20060325T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061028T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:20070325T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20071028T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:IMT
 TZOFFSETFROM:+015552
 TZOFFSETTO:+015656
-TZNAME:IMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19101001T000000
+RDATE:19101001T000000
+TZNAME:EEST
 TZOFFSETFROM:+015656
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19101001T000000
-RDATE:19101001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
 DTSTART:19160501T000000
 RDATE:19160501T000000
 RDATE:19200328T000000
@@ -155,11 +41,11 @@
 RDATE:19740331T020000
 RDATE:19750330T000000
 RDATE:19760601T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19161001T000000
 RDATE:19161001T000000
 RDATE:19201025T000000
@@ -177,43 +63,174 @@
 RDATE:19741103T050000
 RDATE:19771016T000000
 RDATE:19850928T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19241001T000000
+RRULE:FREQ=YEARLY;UNTIL=19250930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19470420T000000
+RRULE:FREQ=YEARLY;UNTIL=19480417T220000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19471005T000000
+RRULE:FREQ=YEARLY;UNTIL=19501007T210000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:TRST
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19700503T000000
+RRULE:FREQ=YEARLY;UNTIL=19720506T220000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19701004T000000
+RRULE:FREQ=YEARLY;UNTIL=19721007T210000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19751026T000000
+RRULE:FREQ=YEARLY;UNTIL=19761030T210000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T000000
+RRULE:FREQ=YEARLY;UNTIL=19780401T220000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19781015T000000
 RDATE:19781015T000000
-RDATE:19800406T030000
-RDATE:19830731T000000
-END:DAYLIGHT
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790401T030000
+RDATE:19790401T030000
+TZNAME:TRST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:TRST
-DTSTART:19790401T030000
-RDATE:19790401T030000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19791015T000000
+RRULE:FREQ=YEARLY;UNTIL=19821010T200000Z;BYDAY=-3MO;BYMONTH=10
+TZNAME:TRT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:TRT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800406T030000
+RRULE:FREQ=YEARLY;UNTIL=19800406T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19810329T030000
+RRULE:FREQ=YEARLY;UNTIL=19820328T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19830731T000000
+RDATE:19830731T000000
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19831002T000000
 RDATE:19831002T000000
+TZNAME:TRT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19850420T000000
+RDATE:19850420T000000
+TZNAME:EEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19860330T020000
+RRULE:FREQ=YEARLY;UNTIL=19900325T000000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EEST
-DTSTART:19850420T000000
-RDATE:19850420T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19860928T030000
+RRULE:FREQ=YEARLY;UNTIL=19900930T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19910331T010000
+RRULE:FREQ=YEARLY;UNTIL=20060325T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910929T020000
+RRULE:FREQ=YEARLY;UNTIL=19950923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061028T230000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20070101T000000
 RDATE:20070101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070325T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071028T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jakarta.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jakarta.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jakarta.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,65 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Jakarta
 X-LIC-LOCATION:Asia/Jakarta
 BEGIN:STANDARD
+DTSTART:18670810T000000
+RDATE:18670810T000000
+TZNAME:JMT
 TZOFFSETFROM:+070712
 TZOFFSETTO:+070712
-TZNAME:JMT
-DTSTART:18670810T000000
-RDATE:18670810T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19231231T234712
+RDATE:19231231T234712
+TZNAME:JAVT
 TZOFFSETFROM:+070712
 TZOFFSETTO:+0720
-TZNAME:JAVT
-DTSTART:19231231T234712
-RDATE:19231231T234712
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:WIT
 TZOFFSETFROM:+0720
 TZOFFSETTO:+0730
-TZNAME:WIT
-DTSTART:19321101T000000
-RDATE:19321101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420323T000000
+RDATE:19420323T000000
+TZNAME:JST
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420323T000000
-RDATE:19420323T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:WIT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0730
-TZNAME:WIT
-DTSTART:19450923T000000
-RDATE:19450923T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19480501T000000
+RDATE:19480501T000000
+TZNAME:WIT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:WIT
-DTSTART:19480501T000000
-RDATE:19480501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19500501T000000
+RDATE:19500501T000000
+TZNAME:WIT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0730
-TZNAME:WIT
-DTSTART:19500501T000000
-RDATE:19500501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:WIT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0700
-TZNAME:WIT
-DTSTART:19640101T000000
-RDATE:19640101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jayapura.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jayapura.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jayapura.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Jayapura
 X-LIC-LOCATION:Asia/Jayapura
 BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:EIT
 TZOFFSETFROM:+092248
 TZOFFSETTO:+0900
-TZNAME:EIT
-DTSTART:19321101T000000
-RDATE:19321101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19440901T000000
+RDATE:19440901T000000
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19440901T000000
-RDATE:19440901T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:EIT
 TZOFFSETFROM:+0930
 TZOFFSETTO:+0900
-TZNAME:EIT
-DTSTART:19640101T000000
-RDATE:19640101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jerusalem.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jerusalem.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jerusalem.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,88 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Jerusalem
 X-LIC-LOCATION:Asia/Jerusalem
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19421101T000000
-RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19481101T020000
-RRULE:FREQ=YEARLY;UNTIL=19491031T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19880903T000000
-RRULE:FREQ=YEARLY;UNTIL=19890902T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20060331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20100326T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20100326T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20120330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20150327T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20150327T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20170331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20210326T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20210326T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20230331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20320326T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20320326T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20340331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20370327T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20370327T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+022056
-TZOFFSETTO:+022040
-TZNAME:JMT
 DTSTART:18800101T000000
 RDATE:18800101T000000
+TZNAME:JMT
+TZOFFSETFROM:+022056
+TZOFFSETTO:+022040
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+022040
-TZOFFSETTO:+0200
-TZNAME:IST
 DTSTART:19180101T000000
 RDATE:19180101T000000
+TZNAME:IST
+TZOFFSETFROM:+022040
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
 DTSTART:19400601T000000
 RDATE:19400601T000000
 RDATE:19430401T020000
@@ -123,13 +60,19 @@
 RDATE:20050401T020000
 RDATE:20110401T020000
 RDATE:20160401T020000
-RDATE:20220401T020000
-RDATE:20330401T020000
+RDATE:20170331T020000
+TZNAME:IDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421101T000000
+RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z;BYMONTH=11
+TZNAME:IST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:IST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19451101T020000
 RDATE:19451101T020000
 RDATE:19461101T000000
@@ -146,6 +89,8 @@
 RDATE:19850915T000000
 RDATE:19860907T000000
 RDATE:19870913T000000
+RDATE:19880903T000000
+RDATE:19890903T000000
 RDATE:19900826T000000
 RDATE:19910901T000000
 RDATE:19920906T000000
@@ -174,40 +119,46 @@
 RDATE:20150920T020000
 RDATE:20161009T020000
 RDATE:20170924T020000
-RDATE:20180916T020000
-RDATE:20191006T020000
-RDATE:20200927T020000
-RDATE:20210912T020000
-RDATE:20221002T020000
-RDATE:20230924T020000
-RDATE:20241006T020000
-RDATE:20250928T020000
-RDATE:20260920T020000
-RDATE:20271010T020000
-RDATE:20280924T020000
-RDATE:20290916T020000
-RDATE:20301006T020000
-RDATE:20310921T020000
-RDATE:20320912T020000
-RDATE:20331002T020000
-RDATE:20340917T020000
-RDATE:20351007T020000
-RDATE:20360928T020000
-RDATE:20370913T020000
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0400
-TZNAME:IDDT
 DTSTART:19480523T000000
 RDATE:19480523T000000
+TZNAME:IDDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19480901T000000
+RDATE:19480901T000000
+TZNAME:IDT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19481101T020000
+RRULE:FREQ=YEARLY;UNTIL=19491031T230000Z;BYMONTH=11
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20060331T020000
+RRULE:FREQ=YEARLY;UNTIL=20100326T000000Z;BYDAY=FR;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=3
 TZNAME:IDT
-DTSTART:19480901T000000
-RDATE:19480901T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20120330T020000
+RRULE:FREQ=YEARLY;UNTIL=20150327T000000Z;BYDAY=FR;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=3
+TZNAME:IDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kabul.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kabul.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kabul.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Kabul
 X-LIC-LOCATION:Asia/Kabul
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:AFT
 TZOFFSETFROM:+043648
 TZOFFSETTO:+0400
-TZNAME:AFT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450101T000000
+RDATE:19450101T000000
+TZNAME:AFT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0430
-TZNAME:AFT
-DTSTART:19450101T000000
-RDATE:19450101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kamchatka.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kamchatka.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kamchatka.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,100 +1,116 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Kamchatka
 X-LIC-LOCATION:Asia/Kamchatka
+BEGIN:STANDARD
+DTSTART:19221110T000000
+RDATE:19221110T000000
+TZNAME:PETT
+TZOFFSETFROM:+103436
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:PETST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T120000Z;BYMONTH=4
+TZNAME:PETST
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:PETST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T120000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T110000Z;BYMONTH=10
+TZNAME:PETT
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:PETT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T110000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T140000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PETT
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:PETT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T140000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:PETST
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+RDATE:20100328T020000
 TZNAME:PETST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T140000Z
-END:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:PETT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:PETST
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:PETST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:PETT
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:PETT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T140000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20090328T140000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:PETST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T140000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PETT
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:PETT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+103436
-TZOFFSETTO:+1100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20091024T140000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:PETT
-DTSTART:19221110T000000
-RDATE:19221110T000000
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
+DTSTART:20101031T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:PETT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19920119T020000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1200
-TZOFFSETTO:+1200
-TZNAME:PETST
-DTSTART:19910331T020000
-RDATE:19910331T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:PETT
-DTSTART:19910929T030000
-RDATE:19910929T030000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
+DTSTART:20110327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:PETST
-DTSTART:19920328T230000
-RDATE:19920328T230000
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:PETT
-DTSTART:19920926T230000
-RDATE:19920926T230000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Karachi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Karachi.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Karachi.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,59 +1,62 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Karachi
 X-LIC-LOCATION:Asia/Karachi
 BEGIN:STANDARD
+DTSTART:19070101T000000
+RDATE:19070101T000000
+TZNAME:IST
 TZOFFSETFROM:+042812
 TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
 TZNAME:IST
-DTSTART:19070101T000000
-RDATE:19070101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451015T000000
+RDATE:19451015T000000
 TZNAME:IST
-DTSTART:19420901T000000
-RDATE:19420901T000000
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0630
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19451015T000000
-RDATE:19451015T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510930T000000
+RDATE:19510930T000000
+TZNAME:KART
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0500
-TZNAME:KART
-DTSTART:19510930T000000
-RDATE:19510930T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19710326T000000
+RDATE:19710326T000000
+TZNAME:PKST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:PKT
-DTSTART:19710326T000000
-RDATE:19710326T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-TZNAME:PKST
 DTSTART:20020407T000100
 RDATE:20020407T000100
 RDATE:20080601T000000
+RDATE:20090415T000000
+TZNAME:PKST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-TZNAME:PKT
 DTSTART:20021006T000100
 RDATE:20021006T000100
 RDATE:20081101T000000
+RDATE:20091101T000000
+TZNAME:PKT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kashgar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kashgar.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kashgar.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,50 +1,52 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Kashgar
 X-LIC-LOCATION:Asia/Kashgar
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19860914T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19910914T150000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19870412T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=10,11,12,13,14,15,16;BYDAY=SU;UNTIL=19910413T160000Z
-END:DAYLIGHT
-BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:KAST
 TZOFFSETFROM:+050356
 TZOFFSETTO:+0530
-TZNAME:KAST
-DTSTART:19280101T000000
-RDATE:19280101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19400101T000000
+RDATE:19400101T000000
+TZNAME:KAST
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0500
-TZNAME:KAST
-DTSTART:19400101T000000
-RDATE:19400101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19800501T000000
+RDATE:19800501T000000
+TZNAME:CST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19860504T000000
+RDATE:19860504T000000
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;UNTIL=19910914T150000Z;BYDAY=SU;BYMONTHDAY=11,12,13,14,1
+ 5,16,17;BYMONTH=9
 TZNAME:CST
-DTSTART:19800501T000000
-RDATE:19800501T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870412T000000
+RRULE:FREQ=YEARLY;UNTIL=19910413T160000Z;BYDAY=-3SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19860504T000000
-RDATE:19860504T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kathmandu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kathmandu.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kathmandu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,23 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Asia/Kathmandu
+X-LIC-LOCATION:Asia/Kathmandu
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:IST
+TZOFFSETFROM:+054116
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860101T000000
+RDATE:19860101T000000
+TZNAME:NPT
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0545
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Katmandu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Katmandu.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Katmandu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Katmandu
 X-LIC-LOCATION:Asia/Katmandu
 BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:IST
 TZOFFSETFROM:+054116
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860101T000000
+RDATE:19860101T000000
+TZNAME:NPT
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0545
-TZNAME:NPT
-DTSTART:19860101T000000
-RDATE:19860101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kolkata.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kolkata.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kolkata.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,37 +1,38 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Kolkata
 X-LIC-LOCATION:Asia/Kolkata
 BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:HMT
 TZOFFSETFROM:+055328
 TZOFFSETTO:+055320
-TZNAME:HMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19411001T000000
+RDATE:19411001T000000
+TZNAME:BURT
 TZOFFSETFROM:+055320
 TZOFFSETTO:+0630
-TZNAME:BURT
-DTSTART:19411001T000000
-RDATE:19411001T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0530
-TZNAME:IST
 DTSTART:19420515T000000
 RDATE:19420515T000000
 RDATE:19451015T000000
+TZNAME:IST
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:IST
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0630
-TZNAME:IST
-DTSTART:19420901T000000
-RDATE:19420901T000000
-END:DAYLIGHT
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Krasnoyarsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Krasnoyarsk.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Krasnoyarsk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,100 +1,101 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Krasnoyarsk
 X-LIC-LOCATION:Asia/Krasnoyarsk
+BEGIN:STANDARD
+DTSTART:19200106T000000
+RDATE:19200106T000000
+TZNAME:KRAT
+TZOFFSETFROM:+061120
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:KRAST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z;BYMONTH=4
+TZNAME:KRAST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:KRAST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z;BYMONTH=10
+TZNAME:KRAT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:KRAT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T190000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KRAT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:KRAT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T190000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T190000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:KRAST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T190000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:KRAST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:KRAST
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0700
-TZNAME:KRAT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T190000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
+DTSTART:19910929T030000
+RDATE:19910929T030000
 TZNAME:KRAT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+061120
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:KRAT
-DTSTART:19200106T000000
-RDATE:19200106T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-TZNAME:KRAT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19920119T020000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:KRAST
 TZOFFSETFROM:+0700
-TZOFFSETTO:+0700
-TZNAME:KRAST
-DTSTART:19910331T020000
-RDATE:19910331T020000
+TZOFFSETTO:+0800
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:KRAT
-DTSTART:19910929T030000
-RDATE:19910929T030000
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:KRAST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:KRAST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T190000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KRAT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:KRAT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuala_Lumpur.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuala_Lumpur.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuala_Lumpur.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,65 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Kuala_Lumpur
 X-LIC-LOCATION:Asia/Kuala_Lumpur
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:SMT
 TZOFFSETFROM:+064646
 TZOFFSETTO:+065525
-TZNAME:SMT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19050601T000000
+RDATE:19050601T000000
+TZNAME:MALT
 TZOFFSETFROM:+065525
 TZOFFSETTO:+0700
-TZNAME:MALT
-DTSTART:19050601T000000
-RDATE:19050601T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+TZNAME:MALST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0720
-TZNAME:MALST
-DTSTART:19330101T000000
-RDATE:19330101T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19360101T000000
+RDATE:19360101T000000
+TZNAME:MALT
 TZOFFSETFROM:+0720
 TZOFFSETTO:+0720
-TZNAME:MALT
-DTSTART:19360101T000000
-RDATE:19360101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19410901T000000
+RDATE:19410901T000000
+TZNAME:MALT
 TZOFFSETFROM:+0720
 TZOFFSETTO:+0730
-TZNAME:MALT
-DTSTART:19410901T000000
-RDATE:19410901T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420216T000000
+RDATE:19420216T000000
+TZNAME:JST
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420216T000000
-RDATE:19420216T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450912T000000
+RDATE:19450912T000000
+TZNAME:MALT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0730
-TZNAME:MALT
-DTSTART:19450912T000000
-RDATE:19450912T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:MYT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:MYT
-DTSTART:19820101T000000
-RDATE:19820101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuching.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuching.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuching.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Kuching
 X-LIC-LOCATION:Asia/Kuching
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0820
-TZNAME:BORTST
-DTSTART:19350914T000000
-RRULE:FREQ=YEARLY;UNTIL=19410913T160000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0820
-TZOFFSETTO:+0800
+DTSTART:19260301T000000
+RDATE:19260301T000000
 TZNAME:BORT
-DTSTART:19351214T000000
-RRULE:FREQ=YEARLY;UNTIL=19411213T154000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+072120
 TZOFFSETTO:+0730
-TZNAME:BORT
-DTSTART:19260301T000000
-RDATE:19260301T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+TZNAME:BORST
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19350914T000000
+RRULE:FREQ=YEARLY;UNTIL=19410913T160000Z;BYMONTH=9
+TZNAME:BORTST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0820
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19351214T000000
+RRULE:FREQ=YEARLY;UNTIL=19411213T154000Z;BYMONTH=12
 TZNAME:BORT
-DTSTART:19330101T000000
-RDATE:19330101T000000
+TZOFFSETFROM:+0820
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420216T000000
+RDATE:19420216T000000
+TZNAME:JST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420216T000000
-RDATE:19420216T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450912T000000
+RDATE:19450912T000000
+TZNAME:BORT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:BORT
-DTSTART:19450912T000000
-RDATE:19450912T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:MYT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:MYT
-DTSTART:19820101T000000
-RDATE:19820101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuwait.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuwait.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuwait.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Kuwait
 X-LIC-LOCATION:Asia/Kuwait
 BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:AST
 TZOFFSETFROM:+031156
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19500101T000000
-RDATE:19500101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macao.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macao.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macao.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,108 +1,112 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Macao
 X-LIC-LOCATION:Asia/Macao
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:MOST
+TZOFFSETFROM:+073420
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19610319T033000
+RRULE:FREQ=YEARLY;UNTIL=19620317T193000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:MOST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:MOST
-DTSTART:19610319T033000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19620317T193000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611105T033000
+RRULE:FREQ=YEARLY;UNTIL=19641031T183000Z;BYDAY=1SU;BYMONTH=11
+TZNAME:MOT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19611105T033000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=19641031T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19630317T000000
+RDATE:19630317T000000
+RDATE:19640322T033000
+RDATE:19650321T000000
+TZNAME:MOST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:MOST
-DTSTART:19660417T033000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19710417T193000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T000000
+RDATE:19651031T000000
+TZNAME:MOT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19661016T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19711016T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19660417T033000
+RRULE:FREQ=YEARLY;UNTIL=19710417T193000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:MOST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:MOST
-DTSTART:19720416T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19740420T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
+DTSTART:19661016T033000
+RRULE:FREQ=YEARLY;UNTIL=19711016T183000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=10
 TZNAME:MOT
-DTSTART:19721015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19731020T150000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19741020T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19771015T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
+DTSTART:19720416T000000
+RRULE:FREQ=YEARLY;UNTIL=19740420T160000Z;BYDAY=3SU;BYMONTH=4
 TZNAME:MOST
-DTSTART:19750420T033000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19770416T193000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:MOST
-DTSTART:19780416T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19800419T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721015T000000
+RRULE:FREQ=YEARLY;UNTIL=19731020T150000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19781015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19801018T150000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+073420
+DTSTART:19741020T033000
+RRULE:FREQ=YEARLY;UNTIL=19771015T183000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19750420T033000
+RRULE:FREQ=YEARLY;UNTIL=19770416T193000Z;BYDAY=3SU;BYMONTH=4
+TZNAME:MOST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19780416T000000
+RRULE:FREQ=YEARLY;UNTIL=19800419T160000Z;BYDAY=3SU;BYMONTH=4
 TZNAME:MOST
-DTSTART:19630317T000000
-RDATE:19630317T000000
-RDATE:19640322T033000
-RDATE:19650321T000000
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19781015T000000
+RRULE:FREQ=YEARLY;UNTIL=19801018T150000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19651031T000000
-RDATE:19651031T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19991220T000000
+RDATE:19991220T000000
+TZNAME:CST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19991220T000000
-RDATE:19991220T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macau.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macau.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,108 +1,112 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Macau
 X-LIC-LOCATION:Asia/Macau
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:MOST
+TZOFFSETFROM:+073420
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19610319T033000
+RRULE:FREQ=YEARLY;UNTIL=19620317T193000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:MOST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:MOST
-DTSTART:19610319T033000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19620317T193000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611105T033000
+RRULE:FREQ=YEARLY;UNTIL=19641031T183000Z;BYDAY=1SU;BYMONTH=11
+TZNAME:MOT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19611105T033000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=19641031T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19630317T000000
+RDATE:19630317T000000
+RDATE:19640322T033000
+RDATE:19650321T000000
+TZNAME:MOST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:MOST
-DTSTART:19660417T033000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19710417T193000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T000000
+RDATE:19651031T000000
+TZNAME:MOT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19661016T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19711016T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19660417T033000
+RRULE:FREQ=YEARLY;UNTIL=19710417T193000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:MOST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:MOST
-DTSTART:19720416T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19740420T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
+DTSTART:19661016T033000
+RRULE:FREQ=YEARLY;UNTIL=19711016T183000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=10
 TZNAME:MOT
-DTSTART:19721015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19731020T150000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19741020T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19771015T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
+DTSTART:19720416T000000
+RRULE:FREQ=YEARLY;UNTIL=19740420T160000Z;BYDAY=3SU;BYMONTH=4
 TZNAME:MOST
-DTSTART:19750420T033000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19770416T193000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:MOST
-DTSTART:19780416T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19800419T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721015T000000
+RRULE:FREQ=YEARLY;UNTIL=19731020T150000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19781015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19801018T150000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+073420
+DTSTART:19741020T033000
+RRULE:FREQ=YEARLY;UNTIL=19771015T183000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19750420T033000
+RRULE:FREQ=YEARLY;UNTIL=19770416T193000Z;BYDAY=3SU;BYMONTH=4
+TZNAME:MOST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19780416T000000
+RRULE:FREQ=YEARLY;UNTIL=19800419T160000Z;BYDAY=3SU;BYMONTH=4
 TZNAME:MOST
-DTSTART:19630317T000000
-RDATE:19630317T000000
-RDATE:19640322T033000
-RDATE:19650321T000000
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19781015T000000
+RRULE:FREQ=YEARLY;UNTIL=19801018T150000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:MOT
-DTSTART:19651031T000000
-RDATE:19651031T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19991220T000000
+RDATE:19991220T000000
+TZNAME:CST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19991220T000000
-RDATE:19991220T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Magadan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Magadan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Magadan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,100 +1,101 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Magadan
 X-LIC-LOCATION:Asia/Magadan
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:MAGT
+TZOFFSETFROM:+100312
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:MAGST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T130000Z;BYMONTH=4
+TZNAME:MAGST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:MAGST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T130000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z;BYMONTH=10
+TZNAME:MAGT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:MAGT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T150000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MAGT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:MAGT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T150000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:MAGST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T150000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:MAGST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:MAGST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:MAGT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T150000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
+DTSTART:19910929T030000
+RDATE:19910929T030000
 TZNAME:MAGT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+100312
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:MAGT
-DTSTART:19240502T000000
-RDATE:19240502T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-TZNAME:MAGT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19920119T020000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:MAGST
 TZOFFSETFROM:+1100
-TZOFFSETTO:+1100
-TZNAME:MAGST
-DTSTART:19910331T020000
-RDATE:19910331T020000
+TZOFFSETTO:+1200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:MAGT
-DTSTART:19910929T030000
-RDATE:19910929T030000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:MAGST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:MAGST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T150000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MAGT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:MAGT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Makassar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Makassar.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Makassar.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Makassar
 X-LIC-LOCATION:Asia/Makassar
 BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:MMT
 TZOFFSETFROM:+075736
 TZOFFSETTO:+075736
-TZNAME:MMT
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:CIT
 TZOFFSETFROM:+075736
 TZOFFSETTO:+0800
-TZNAME:CIT
-DTSTART:19321101T000000
-RDATE:19321101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420209T000000
+RDATE:19420209T000000
+TZNAME:JST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420209T000000
-RDATE:19420209T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:CIT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CIT
-DTSTART:19450923T000000
-RDATE:19450923T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Manila.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Manila.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Manila.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,48 +1,48 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Manila
 X-LIC-LOCATION:Asia/Manila
 BEGIN:STANDARD
-TZOFFSETFROM:-1556
-TZOFFSETTO:+0804
-TZNAME:LMT
-DTSTART:18441231T000000
-RDATE:18441231T000000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18990511T000000
+RDATE:18990511T000000
+TZNAME:PHST
 TZOFFSETFROM:+0804
 TZOFFSETTO:+0800
-TZNAME:PHT
-DTSTART:18990511T000000
-RDATE:18990511T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:PHST
 DTSTART:19361101T000000
 RDATE:19361101T000000
 RDATE:19540412T000000
 RDATE:19780322T000000
+TZNAME:PHST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-TZNAME:PHT
 DTSTART:19370201T000000
 RDATE:19370201T000000
-RDATE:19441101T000000
 RDATE:19540701T000000
 RDATE:19780921T000000
+TZNAME:PHT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420501T000000
+RDATE:19420501T000000
+TZNAME:JST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420501T000000
-RDATE:19420501T000000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19441101T000000
+RDATE:19441101T000000
+TZNAME:PHST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Muscat.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Muscat.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Muscat.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Muscat
 X-LIC-LOCATION:Asia/Muscat
 BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:GST
 TZOFFSETFROM:+035420
 TZOFFSETTO:+0400
-TZNAME:GST
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Nicosia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Nicosia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Nicosia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,75 +1,76 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Nicosia
 X-LIC-LOCATION:Asia/Nicosia
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
+BEGIN:STANDARD
+DTSTART:19211114T000000
+RDATE:19211114T000000
 TZNAME:EEST
-DTSTART:19770403T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800405T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+021328
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19790930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19970927T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19750413T000000
+RDATE:19750413T000000
+RDATE:19760515T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19810329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19751012T000000
+RDATE:19751012T000000
+RDATE:19761011T000000
+RDATE:19770925T000000
+RDATE:19781002T000000
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19981025T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19770403T000000
+RRULE:FREQ=YEARLY;UNTIL=19800405T220000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19990328T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+021328
+DTSTART:19790930T000000
+RRULE:FREQ=YEARLY;UNTIL=19970927T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19211114T000000
-RDATE:19211114T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T000000
+RRULE:FREQ=YEARLY;UNTIL=19980328T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19750413T000000
-RDATE:19750413T000000
-RDATE:19760515T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19980901T000000
+RDATE:19980901T000000
+TZNAME:EEST
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19981025T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19751012T000000
-RDATE:19751012T000000
-RDATE:19761011T000000
-RDATE:19770925T000000
-RDATE:19781002T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
+DTSTART:19990328T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19980901T000000
-RDATE:19980901T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novokuznetsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novokuznetsk.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novokuznetsk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,122 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Asia/Novokuznetsk
+X-LIC-LOCATION:Asia/Novokuznetsk
+BEGIN:STANDARD
+DTSTART:19200106T000000
+RDATE:19200106T000000
+TZNAME:KRAT
+TZOFFSETFROM:+054848
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:KRAST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z;BYMONTH=4
+TZNAME:KRAST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z;BYMONTH=10
+TZNAME:KRAT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T190000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KRAT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T190000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:KRAST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:KRAST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:KRAT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:KRAST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:KRAT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20090328T190000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:KRAST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T190000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KRAT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20091024T190000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:KRAT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100328T020000
+RDATE:20100328T020000
+TZNAME:NOVST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20101031T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:NOVT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20110327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:NOVST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novosibirsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novosibirsk.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novosibirsk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,108 +1,109 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Novosibirsk
 X-LIC-LOCATION:Asia/Novosibirsk
+BEGIN:STANDARD
+DTSTART:19191214T060000
+RDATE:19191214T060000
+TZNAME:NOVT
+TZOFFSETFROM:+053140
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:NOVST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z;BYMONTH=4
+TZNAME:NOVST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:NOVST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T170000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z;BYMONTH=10
+TZNAME:NOVT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:NOVT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T190000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:NOVT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:NOVT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T190000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T190000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:NOVST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:NOVST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T190000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:NOVST
 TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:NOVT
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:NOVT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T200000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
+DTSTART:19920328T230000
+RDATE:19920328T230000
+RDATE:19930328T020000
 TZNAME:NOVST
-DTSTART:19940327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:NOVT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+053140
-TZOFFSETTO:+0600
-TZNAME:NOVT
-DTSTART:19191214T060000
-RDATE:19191214T060000
+DTSTART:19930523T000000
+RDATE:19930523T000000
+TZNAME:NOVST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T200000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:NOVT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19920119T020000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0700
-TZOFFSETTO:+0700
-TZNAME:NOVST
-DTSTART:19910331T020000
-RDATE:19910331T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:NOVT
-DTSTART:19910929T030000
-RDATE:19910929T030000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
+DTSTART:19940327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:NOVST
-DTSTART:19920328T230000
-RDATE:19920328T230000
-RDATE:19930328T020000
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:NOVT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-TZNAME:NOVST
-DTSTART:19930523T000000
-RDATE:19930523T000000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Omsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Omsk.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Omsk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,100 +1,101 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Omsk
 X-LIC-LOCATION:Asia/Omsk
+BEGIN:STANDARD
+DTSTART:19191114T000000
+RDATE:19191114T000000
+TZNAME:OMST
+TZOFFSETFROM:+045336
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:OMSST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z;BYMONTH=4
+TZNAME:OMSST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:OMSST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
+TZNAME:OMST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:OMST
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:OMST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:OMST
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T200000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:OMSST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:OMSST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:OMSST
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:OMST
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T200000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
+DTSTART:19910929T030000
+RDATE:19910929T030000
 TZNAME:OMST
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+045336
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:OMST
-DTSTART:19191114T000000
-RDATE:19191114T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-TZNAME:OMST
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19920119T020000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:OMSST
 TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:OMSST
-DTSTART:19910331T020000
-RDATE:19910331T020000
+TZOFFSETTO:+0700
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:OMST
-DTSTART:19910929T030000
-RDATE:19910929T030000
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:OMSST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:OMSST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:OMST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:OMST
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Oral.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Oral.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Oral.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,148 +1,149 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Oral
 X-LIC-LOCATION:Asia/Oral
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:URAT
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+TZOFFSETFROM:+032524
+TZOFFSETTO:+0400
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-TZNAME:URAST
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:URAT
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:URAT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T210000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19810401T000000
+RDATE:19810401T000000
+TZNAME:URAST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:URAST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T210000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
+DTSTART:19811001T000000
+RDATE:19811001T000000
 TZNAME:URAT
-DTSTART:19890924T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T220000Z
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:ORAST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T220000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:ORAT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T220000Z
+DTSTART:19820401T000000
+RDATE:19820401T000000
+TZNAME:URAST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:ORAT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20041030T220000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+032524
-TZOFFSETTO:+0400
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
 TZNAME:URAT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:URAT
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:URAST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:URAST
-DTSTART:19810401T000000
-RDATE:19810401T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19880924T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:URAT
 TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:URAT
-DTSTART:19811001T000000
-RDATE:19811001T000000
+TZOFFSETTO:+0500
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19880326T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:URAST
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19890326T020000
+RDATE:19890326T020000
 TZNAME:URAST
-DTSTART:19820401T000000
-RDATE:19820401T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:URAT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19900325T020000
+RDATE:19900325T020000
 TZNAME:URAST
-DTSTART:19890326T020000
-RDATE:19890326T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:URAST
-DTSTART:19900325T020000
-RDATE:19900325T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+TZNAME:URAT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:URAT
-DTSTART:19910101T000000
-RDATE:19910101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19911216T000000
+RDATE:19911216T000000
+TZNAME:ORAST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:ORAST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:ORAT
-DTSTART:19911216T000000
-RDATE:19911216T000000
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20040327T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ORAST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:ORAST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ORAT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20041030T220000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:ORAT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20050315T000000
+RDATE:20050315T000000
+TZNAME:ORAT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:ORAT
-DTSTART:20050315T000000
-RDATE:20050315T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Phnom_Penh.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Phnom_Penh.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Phnom_Penh.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Phnom_Penh
 X-LIC-LOCATION:Asia/Phnom_Penh
 BEGIN:STANDARD
+DTSTART:19060609T000000
+RDATE:19060609T000000
+TZNAME:SMT
 TZOFFSETFROM:+065940
 TZOFFSETTO:+070620
-TZNAME:SMT
-DTSTART:19060609T000000
-RDATE:19060609T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:ICT
 TZOFFSETFROM:+070620
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19110311T000100
-RDATE:19110311T000100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120501T000000
+RDATE:19120501T000000
+TZNAME:ICT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:ICT
-DTSTART:19120501T000000
-RDATE:19120501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19310501T000000
+RDATE:19310501T000000
+TZNAME:ICT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19310501T000000
-RDATE:19310501T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pontianak.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pontianak.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pontianak.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,65 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Pontianak
 X-LIC-LOCATION:Asia/Pontianak
 BEGIN:STANDARD
+DTSTART:19080501T000000
+RDATE:19080501T000000
+TZNAME:PMT
 TZOFFSETFROM:+071720
 TZOFFSETTO:+071720
-TZNAME:PMT
-DTSTART:19080501T000000
-RDATE:19080501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:WIT
 TZOFFSETFROM:+071720
 TZOFFSETTO:+0730
-TZNAME:WIT
-DTSTART:19321101T000000
-RDATE:19321101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420129T000000
+RDATE:19420129T000000
+TZNAME:JST
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420129T000000
-RDATE:19420129T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:WIT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0730
-TZNAME:WIT
-DTSTART:19450923T000000
-RDATE:19450923T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19480501T000000
+RDATE:19480501T000000
+TZNAME:WIT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:WIT
-DTSTART:19480501T000000
-RDATE:19480501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19500501T000000
+RDATE:19500501T000000
+TZNAME:WIT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0730
-TZNAME:WIT
-DTSTART:19500501T000000
-RDATE:19500501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:CIT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:CIT
-DTSTART:19640101T000000
-RDATE:19640101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19880101T000000
+RDATE:19880101T000000
+TZNAME:WIT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:WIT
-DTSTART:19880101T000000
-RDATE:19880101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pyongyang.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pyongyang.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pyongyang.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,44 +1,45 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Pyongyang
 X-LIC-LOCATION:Asia/Pyongyang
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KST
 TZOFFSETFROM:+0823
 TZOFFSETTO:+0830
-TZNAME:KST
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0830
-TZOFFSETTO:+0900
-TZNAME:KST
 DTSTART:19041201T000000
 RDATE:19041201T000000
 RDATE:19320101T000000
+TZNAME:KST
+TZOFFSETFROM:+0830
+TZOFFSETTO:+0900
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:KST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0830
-TZNAME:KST
-DTSTART:19280101T000000
-RDATE:19280101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19540321T000000
+RDATE:19540321T000000
+TZNAME:KST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:KST
-DTSTART:19540321T000000
-RDATE:19540321T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19610810T000000
+RDATE:19610810T000000
+TZNAME:KST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:KST
-DTSTART:19610810T000000
-RDATE:19610810T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qatar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qatar.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qatar.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Qatar
 X-LIC-LOCATION:Asia/Qatar
 BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:GST
 TZOFFSETFROM:+032608
 TZOFFSETTO:+0400
-TZNAME:GST
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19720601T000000
+RDATE:19720601T000000
+TZNAME:AST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19720601T000000
-RDATE:19720601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qyzylorda.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qyzylorda.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qyzylorda.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,134 +1,135 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Qyzylorda
 X-LIC-LOCATION:Asia/Qyzylorda
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:KIZT
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+TZOFFSETFROM:+042152
+TZOFFSETTO:+0400
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-TZNAME:KIZST
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:KIZT
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:KIZT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19810401T000000
+RDATE:19810401T000000
+TZNAME:KIZST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:KIZST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RDATE:19811001T000000
+TZNAME:KIZT
 TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-TZNAME:QYZST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T200000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:QYZT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T200000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
+DTSTART:19820401T000000
+RDATE:19820401T000000
+TZNAME:KIZST
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:QYZT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20041030T200000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+042152
-TZOFFSETTO:+0400
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
 TZNAME:KIZT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:KIZT
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:KIZST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:KIZST
-DTSTART:19810401T000000
-RDATE:19810401T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KIZT
 TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:KIZT
-DTSTART:19811001T000000
-RDATE:19811001T000000
+TZOFFSETTO:+0500
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:KIZST
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:KIZST
-DTSTART:19820401T000000
-RDATE:19820401T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+TZNAME:KIZT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:KIZT
-DTSTART:19910101T000000
-RDATE:19910101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19911216T000000
+RDATE:19911216T000000
+TZNAME:QYZT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:QYZT
-DTSTART:19911216T000000
-RDATE:19911216T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:QYZST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:QYZST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:QYZT
-DTSTART:19920119T020000
-RDATE:19920119T020000
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20040327T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:QYZST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:QYZST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:QYZT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20041030T200000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:QYZT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20050315T000000
+RDATE:20050315T000000
+TZNAME:QYZT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:QYZT
-DTSTART:20050315T000000
-RDATE:20050315T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Rangoon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Rangoon.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Rangoon.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Rangoon
 X-LIC-LOCATION:Asia/Rangoon
 BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:RMT
 TZOFFSETFROM:+062440
 TZOFFSETTO:+062436
-TZNAME:RMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:BURT
 TZOFFSETFROM:+062436
 TZOFFSETTO:+0630
-TZNAME:BURT
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420501T000000
+RDATE:19420501T000000
+TZNAME:JST
 TZOFFSETFROM:+0630
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420501T000000
-RDATE:19420501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450503T000000
+RDATE:19450503T000000
+TZNAME:MMT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0630
-TZNAME:MMT
-DTSTART:19450503T000000
-RDATE:19450503T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Riyadh.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Riyadh.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Riyadh.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Riyadh
 X-LIC-LOCATION:Asia/Riyadh
 BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:AST
 TZOFFSETFROM:+030652
 TZOFFSETTO:+0300
-TZNAME:AST
-DTSTART:19500101T000000
-RDATE:19500101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Saigon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Saigon.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Saigon.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Saigon
 X-LIC-LOCATION:Asia/Saigon
 BEGIN:STANDARD
+DTSTART:19060609T000000
+RDATE:19060609T000000
+TZNAME:SMT
 TZOFFSETFROM:+070640
 TZOFFSETTO:+070620
-TZNAME:SMT
-DTSTART:19060609T000000
-RDATE:19060609T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:ICT
 TZOFFSETFROM:+070620
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19110311T000100
-RDATE:19110311T000100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120501T000000
+RDATE:19120501T000000
+TZNAME:ICT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:ICT
-DTSTART:19120501T000000
-RDATE:19120501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19310501T000000
+RDATE:19310501T000000
+TZNAME:ICT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19310501T000000
-RDATE:19310501T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Sakhalin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Sakhalin.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Sakhalin.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,122 +1,123 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Sakhalin
 X-LIC-LOCATION:Asia/Sakhalin
+BEGIN:STANDARD
+DTSTART:19050823T000000
+RDATE:19050823T000000
+TZNAME:CJT
+TZOFFSETFROM:+093048
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19380101T000000
+RDATE:19380101T000000
+TZNAME:JST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450825T000000
+RDATE:19450825T000000
+TZNAME:SAKST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T130000Z;BYMONTH=4
+TZNAME:SAKST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:SAKST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T130000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z;BYMONTH=10
+TZNAME:SAKT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:SAKT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T150000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:SAKT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:SAKT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T150000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:SAKST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T150000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:SAKST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T150000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+DTSTART:19910331T020000
+RDATE:19910331T020000
+RDATE:19970330T020000
+TZNAME:SAKST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1100
-TZNAME:SAKT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T150000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:SAKT
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:SAKT
-DTSTART:19971026T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:SAKST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
 TZNAME:SAKST
-DTSTART:19980329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+093048
-TZOFFSETTO:+0900
-TZNAME:CJT
-DTSTART:19050823T000000
-RDATE:19050823T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19380101T000000
-RDATE:19380101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0900
+DTSTART:19920926T230000
+RDATE:19920926T230000
+RDATE:19961027T030000
+TZNAME:SAKT
+TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:SAKT
-DTSTART:19450825T000000
-RDATE:19450825T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=19960330T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:SAKST
 TZOFFSETFROM:+1100
-TZOFFSETTO:+1100
-TZNAME:SAKST
-DTSTART:19910331T020000
-RDATE:19910331T020000
-RDATE:19970330T020000
+TZOFFSETTO:+1200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T150000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:SAKT
-DTSTART:19910929T030000
-RDATE:19910929T030000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
+DTSTART:19971026T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:SAKT
-DTSTART:19920119T020000
-RDATE:19920119T020000
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
+DTSTART:19980329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:SAKST
-DTSTART:19920328T230000
-RDATE:19920328T230000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-TZNAME:SAKT
-DTSTART:19920926T230000
-RDATE:19920926T230000
-RDATE:19961027T030000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Samarkand.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Samarkand.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Samarkand.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,92 +1,93 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Samarkand
 X-LIC-LOCATION:Asia/Samarkand
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:SAMT
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
+TZOFFSETFROM:+042712
+TZOFFSETTO:+0400
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:SAMT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810401T000000
+RDATE:19810401T000000
+TZNAME:SAMST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RDATE:19811001T000000
+TZNAME:TAST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820401T000000
+RDATE:19820401T000000
 TZNAME:SAMST
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:SAMT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:SAMT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:SAMST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:SAMST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19910330T210000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+042712
-TZOFFSETTO:+0400
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:SAMT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:SAMT
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19910330T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:SAMST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:SAMST
-DTSTART:19810401T000000
-RDATE:19810401T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910901T000000
+RDATE:19910901T000000
+TZNAME:UZST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:TAST
-DTSTART:19811001T000000
-RDATE:19811001T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:SAMST
-DTSTART:19820401T000000
-RDATE:19820401T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:UZST
-DTSTART:19910901T000000
-RDATE:19910901T000000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:UZT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:UZT
-DTSTART:19910929T030000
-RDATE:19910929T030000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
+TZNAME:UZT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:UZT
-DTSTART:19920101T000000
-RDATE:19920101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Seoul.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Seoul.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Seoul.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,67 +1,68 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Seoul
 X-LIC-LOCATION:Asia/Seoul
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-TZNAME:KDT
-DTSTART:19870510T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19880507T150000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
+DTSTART:18900101T000000
+RDATE:18900101T000000
 TZNAME:KST
-DTSTART:19871011T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19881008T140000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+082752
 TZOFFSETTO:+0830
-TZNAME:KST
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0830
-TZOFFSETTO:+0900
-TZNAME:KST
 DTSTART:19041201T000000
 RDATE:19041201T000000
 RDATE:19320101T000000
 RDATE:19681001T000000
+TZNAME:KST
+TZOFFSETFROM:+0830
+TZOFFSETTO:+0900
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:KST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0830
-TZNAME:KST
-DTSTART:19280101T000000
-RDATE:19280101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-TZNAME:KST
 DTSTART:19540321T000000
 RDATE:19540321T000000
 RDATE:19600913T000000
+TZNAME:KST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19600515T000000
+RDATE:19600515T000000
+TZNAME:KDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:KDT
-DTSTART:19600515T000000
-RDATE:19600515T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19610810T000000
+RDATE:19610810T000000
+TZNAME:KST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0830
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870510T000000
+RRULE:FREQ=YEARLY;UNTIL=19880507T150000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:KDT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871011T000000
+RRULE:FREQ=YEARLY;UNTIL=19881008T140000Z;BYDAY=2SU;BYMONTH=10
 TZNAME:KST
-DTSTART:19610810T000000
-RDATE:19610810T000000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Shanghai.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Shanghai.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Shanghai.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,52 +1,54 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Shanghai
 X-LIC-LOCATION:Asia/Shanghai
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
+DTSTART:19280101T000000
+RDATE:19280101T000000
 TZNAME:CST
-DTSTART:19401001T000000
-RRULE:FREQ=YEARLY;UNTIL=19410930T150000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0900
+TZOFFSETFROM:+080552
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19860914T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19910914T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19400603T000000
+RDATE:19400603T000000
+RDATE:19410316T000000
+RDATE:19860504T000000
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19870412T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=10,11,12,13,14,15,16;BYDAY=SU;UNTIL=19910413T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+080552
+DTSTART:19401001T000000
+RRULE:FREQ=YEARLY;UNTIL=19410930T150000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19490101T000000
+RDATE:19490101T000000
 TZNAME:CST
-DTSTART:19280101T000000
-RDATE:19280101T000000
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0800
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;UNTIL=19910914T150000Z;BYDAY=SU;BYMONTHDAY=11,12,13,14,1
+ 5,16,17;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870412T000000
+RRULE:FREQ=YEARLY;UNTIL=19910413T160000Z;BYDAY=-3SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19400603T000000
-RDATE:19400603T000000
-RDATE:19410316T000000
-RDATE:19860504T000000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19490101T000000
-RDATE:19490101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Singapore.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Singapore.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Singapore.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,71 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Singapore
 X-LIC-LOCATION:Asia/Singapore
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:SMT
 TZOFFSETFROM:+065525
 TZOFFSETTO:+065525
-TZNAME:SMT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19050601T000000
+RDATE:19050601T000000
+TZNAME:MALT
 TZOFFSETFROM:+065525
 TZOFFSETTO:+0700
-TZNAME:MALT
-DTSTART:19050601T000000
-RDATE:19050601T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+TZNAME:MALST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0720
-TZNAME:MALST
-DTSTART:19330101T000000
-RDATE:19330101T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19360101T000000
+RDATE:19360101T000000
+TZNAME:MALT
 TZOFFSETFROM:+0720
 TZOFFSETTO:+0720
-TZNAME:MALT
-DTSTART:19360101T000000
-RDATE:19360101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19410901T000000
+RDATE:19410901T000000
+TZNAME:MALT
 TZOFFSETFROM:+0720
 TZOFFSETTO:+0730
-TZNAME:MALT
-DTSTART:19410901T000000
-RDATE:19410901T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420216T000000
+RDATE:19420216T000000
+TZNAME:JST
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420216T000000
-RDATE:19420216T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450912T000000
+RDATE:19450912T000000
+TZNAME:MALT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0730
-TZNAME:MALT
-DTSTART:19450912T000000
-RDATE:19450912T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19650809T000000
+RDATE:19650809T000000
+TZNAME:SGT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0730
-TZNAME:SGT
-DTSTART:19650809T000000
-RDATE:19650809T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:SGT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:SGT
-DTSTART:19820101T000000
-RDATE:19820101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Taipei.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Taipei.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Taipei.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,86 +1,87 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Taipei
 X-LIC-LOCATION:Asia/Taipei
+BEGIN:STANDARD
+DTSTART:18960101T000000
+RDATE:18960101T000000
+TZNAME:CST
+TZOFFSETFROM:+0806
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19450501T000000
+RRULE:FREQ=YEARLY;UNTIL=19510430T160000Z;BYMONTH=5
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19450501T000000
-RRULE:FREQ=YEARLY;UNTIL=19510430T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451001T000000
+RRULE:FREQ=YEARLY;UNTIL=19510930T150000Z;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19451001T000000
-RRULE:FREQ=YEARLY;UNTIL=19510930T150000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19520301T000000
+RDATE:19520301T000000
+RDATE:19790630T000000
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19521101T000000
+RRULE:FREQ=YEARLY;UNTIL=19541031T150000Z;BYMONTH=11
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19521101T000000
-RRULE:FREQ=YEARLY;UNTIL=19541031T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19530401T000000
+RRULE:FREQ=YEARLY;UNTIL=19590331T160000Z;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19530401T000000
-RRULE:FREQ=YEARLY;UNTIL=19590331T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19551001T000000
+RRULE:FREQ=YEARLY;UNTIL=19610930T150000Z;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19551001T000000
-RRULE:FREQ=YEARLY;UNTIL=19610930T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19600601T000000
+RRULE:FREQ=YEARLY;UNTIL=19610531T160000Z;BYMONTH=6
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19600601T000000
-RRULE:FREQ=YEARLY;UNTIL=19610531T160000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19740401T000000
+RRULE:FREQ=YEARLY;UNTIL=19750331T160000Z;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19740401T000000
-RRULE:FREQ=YEARLY;UNTIL=19750331T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741001T000000
+RRULE:FREQ=YEARLY;UNTIL=19750930T150000Z;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19741001T000000
-RRULE:FREQ=YEARLY;UNTIL=19750930T150000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0806
-TZOFFSETTO:+0800
+DTSTART:19790930T000000
+RDATE:19790930T000000
 TZNAME:CST
-DTSTART:18960101T000000
-RDATE:18960101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19520301T000000
-RDATE:19520301T000000
-RDATE:19800630T000000
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19800930T000000
-RDATE:19800930T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tashkent.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tashkent.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tashkent.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,78 +1,79 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Tashkent
 X-LIC-LOCATION:Asia/Tashkent
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-TZNAME:TASST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:TAST
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z
+TZOFFSETFROM:+043712
+TZOFFSETTO:+0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0700
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:TASST
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:TAST
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T200000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T180000Z;BYMONTH=4
+TZNAME:TASST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0700
-TZNAME:TASST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T200000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+043712
-TZOFFSETTO:+0500
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
 TZNAME:TAST
-DTSTART:19240502T000000
-RDATE:19240502T000000
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:TAST
+TZOFFSETFROM:+0700
 TZOFFSETTO:+0600
-TZNAME:TAST
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:TASST
 TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-TZNAME:TASST
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+TZNAME:TASST
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0600
-TZNAME:UZST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19910901T000000
 RDATE:19910901T000000
-END:DAYLIGHT
+TZNAME:UZST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:UZT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:UZT
-DTSTART:19910929T030000
-RDATE:19910929T030000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
+TZNAME:UZT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:UZT
-DTSTART:19920101T000000
-RDATE:19920101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tbilisi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tbilisi.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tbilisi.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,157 +1,152 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Tbilisi
 X-LIC-LOCATION:Asia/Tbilisi
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:TBIST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:TBIT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:TBMT
+TZOFFSETFROM:+025916
+TZOFFSETTO:+025916
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:TBIT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T220000Z
+TZOFFSETFROM:+025916
+TZOFFSETTO:+0300
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
+BEGIN:STANDARD
+DTSTART:19570301T000000
+RDATE:19570301T000000
 TZNAME:TBIST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T220000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:GEST
-DTSTART:19920329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T210000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:GET
-DTSTART:19920927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19930925T200000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
+TZNAME:TBIST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:GEST
-DTSTART:19950326T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T200000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:TBIT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:GET
-DTSTART:19971026T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031025T190000Z
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:GEST
-DTSTART:19980329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20040327T200000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+025916
-TZOFFSETTO:+025916
-TZNAME:TBMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+025916
-TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:TBIT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:TBIT
-DTSTART:19570301T000000
-RDATE:19570301T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T220000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:TBIST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+TZNAME:TBIST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:GEST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19910409T000000
 RDATE:19910409T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+RDATE:19940925T000000
+TZNAME:GEST
 TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:GET
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19910929T030000
 RDATE:19910929T030000
 RDATE:20041031T030000
+TZNAME:GET
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:GET
 DTSTART:19920101T000000
 RDATE:19920101T000000
+TZNAME:GEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
+BEGIN:DAYLIGHT
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;UNTIL=19940326T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GEST
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;UNTIL=19930925T200000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:GET
-DTSTART:19940925T000000
-RDATE:19940925T000000
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19950326T000000
+RRULE:FREQ=YEARLY;UNTIL=19960330T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GEST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:GET
 DTSTART:19950924T000000
 RDATE:19950924T000000
-END:STANDARD
-BEGIN:DAYLIGHT
+TZNAME:GET
 TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-TZNAME:GEST
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19961027T000000
 RDATE:19961027T000000
 RDATE:19970330T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+TZNAME:GEST
 TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19971026T000000
+RRULE:FREQ=YEARLY;UNTIL=20031025T190000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:GET
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19980329T000000
+RRULE:FREQ=YEARLY;UNTIL=20040327T200000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:GEST
-DTSTART:20040627T000000
-RDATE:20040627T000000
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+DTSTART:20040627T000000
+RDATE:20040627T000000
+TZNAME:GEST
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:GET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20050327T020000
 RDATE:20050327T020000
+TZNAME:GET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tehran.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tehran.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tehran.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,272 +1,159 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Tehran
 X-LIC-LOCATION:Asia/Tehran
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:19790321T000000
-RRULE:FREQ=YEARLY;UNTIL=19800320T203000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19910922T000000
-RRULE:FREQ=YEARLY;UNTIL=19950921T193000Z
+DTSTART:19160101T000000
+RDATE:19160101T000000
+TZNAME:TMT
+TZOFFSETFROM:+032544
+TZOFFSETTO:+032544
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:19920322T000000
-RRULE:FREQ=YEARLY;UNTIL=19950321T203000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:19970322T000000
-RRULE:FREQ=YEARLY;UNTIL=19990321T203000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:19460101T000000
+RDATE:19460101T000000
 TZNAME:IRST
-DTSTART:19970922T000000
-RRULE:FREQ=YEARLY;UNTIL=19990921T193000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20010322T000000
-RRULE:FREQ=YEARLY;UNTIL=20030321T203000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0430
+TZOFFSETFROM:+032544
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20010922T000000
-RRULE:FREQ=YEARLY;UNTIL=20030921T193000Z
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20090322T000000
-RRULE:FREQ=YEARLY;UNTIL=20110321T203000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:19771101T000000
+RDATE:19771101T000000
 TZNAME:IRST
-DTSTART:20090922T000000
-RRULE:FREQ=YEARLY;UNTIL=20110921T193000Z
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
+DTSTART:19780321T000000
+RDATE:19780321T000000
 TZNAME:IRDT
-DTSTART:20130322T000000
-RRULE:FREQ=YEARLY;UNTIL=20150321T203000Z
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:19781021T000000
+RDATE:19781021T000000
 TZNAME:IRST
-DTSTART:20130922T000000
-RRULE:FREQ=YEARLY;UNTIL=20150921T193000Z
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20170322T000000
-RRULE:FREQ=YEARLY;UNTIL=20190321T203000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:19790101T000000
+RDATE:19790101T000000
 TZNAME:IRST
-DTSTART:20170922T000000
-RRULE:FREQ=YEARLY;UNTIL=20190921T193000Z
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790321T000000
+RRULE:FREQ=YEARLY;UNTIL=19800320T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20210322T000000
-RRULE:FREQ=YEARLY;UNTIL=20230321T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790919T000000
+RDATE:19790919T000000
+RDATE:19800923T000000
+RDATE:19960921T000000
+RDATE:20000921T000000
+RDATE:20040921T000000
+RDATE:20050922T000000
+RDATE:20080921T000000
+RDATE:20120921T000000
+RDATE:20160921T000000
+RDATE:20170922T000000
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20210922T000000
-RRULE:FREQ=YEARLY;UNTIL=20230921T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19910503T000000
+RDATE:19910503T000000
+RDATE:19960321T000000
+RDATE:20000321T000000
+RDATE:20040321T000000
+RDATE:20050322T000000
+RDATE:20080321T000000
+RDATE:20120321T000000
+RDATE:20160321T000000
+RDATE:20170322T000000
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20250322T000000
-RRULE:FREQ=YEARLY;UNTIL=20270321T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910922T000000
+RRULE:FREQ=YEARLY;UNTIL=19950921T193000Z;BYMONTH=9
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20250922T000000
-RRULE:FREQ=YEARLY;UNTIL=20270921T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920322T000000
+RRULE:FREQ=YEARLY;UNTIL=19950321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20280321T000000
-RRULE:FREQ=YEARLY;UNTIL=20290320T203000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20280921T000000
-RRULE:FREQ=YEARLY;UNTIL=20290920T193000Z
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19970322T000000
+RRULE:FREQ=YEARLY;UNTIL=19990321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20300322T000000
-RRULE:FREQ=YEARLY;UNTIL=20310321T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19970922T000000
+RRULE:FREQ=YEARLY;UNTIL=19990921T193000Z;BYMONTH=9
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20300922T000000
-RRULE:FREQ=YEARLY;UNTIL=20310921T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010322T000000
+RRULE:FREQ=YEARLY;UNTIL=20030321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20320321T000000
-RRULE:FREQ=YEARLY;UNTIL=20330320T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20010922T000000
+RRULE:FREQ=YEARLY;UNTIL=20030921T193000Z;BYMONTH=9
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20320921T000000
-RRULE:FREQ=YEARLY;UNTIL=20330920T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20090322T000000
+RRULE:FREQ=YEARLY;UNTIL=20110321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20340322T000000
-RRULE:FREQ=YEARLY;UNTIL=20350321T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20090922T000000
+RRULE:FREQ=YEARLY;UNTIL=20110921T193000Z;BYMONTH=9
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20340922T000000
-RRULE:FREQ=YEARLY;UNTIL=20350921T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20130322T000000
+RRULE:FREQ=YEARLY;UNTIL=20150321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20360321T000000
-RRULE:FREQ=YEARLY;UNTIL=20370320T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:20130922T000000
+RRULE:FREQ=YEARLY;UNTIL=20150921T193000Z;BYMONTH=9
 TZNAME:IRST
-DTSTART:20360921T000000
-RRULE:FREQ=YEARLY;UNTIL=20370920T193000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+032544
-TZOFFSETTO:+032544
-TZNAME:TMT
-DTSTART:19160101T000000
-RDATE:19160101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+032544
-TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19460101T000000
-RDATE:19460101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0400
-TZNAME:IRST
-DTSTART:19771101T000000
-RDATE:19771101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:IRDT
-DTSTART:19780321T000000
-RDATE:19780321T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:IRST
-DTSTART:19781021T000000
-RDATE:19781021T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19790101T000000
-RDATE:19790101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19790919T000000
-RDATE:19790919T000000
-RDATE:19800923T000000
-RDATE:19960921T000000
-RDATE:20000921T000000
-RDATE:20040921T000000
-RDATE:20050922T000000
-RDATE:20080921T000000
-RDATE:20120921T000000
-RDATE:20160921T000000
-RDATE:20200921T000000
-RDATE:20240921T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:19910503T000000
-RDATE:19910503T000000
-RDATE:19960321T000000
-RDATE:20000321T000000
-RDATE:20040321T000000
-RDATE:20050322T000000
-RDATE:20080321T000000
-RDATE:20120321T000000
-RDATE:20160321T000000
-RDATE:20200321T000000
-RDATE:20240321T000000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tel_Aviv.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tel_Aviv.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tel_Aviv.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,88 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Tel_Aviv
 X-LIC-LOCATION:Asia/Tel_Aviv
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19421101T000000
-RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19481101T020000
-RRULE:FREQ=YEARLY;UNTIL=19491031T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19880903T000000
-RRULE:FREQ=YEARLY;UNTIL=19890902T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20060331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20100326T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20100326T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20120330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20150327T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20150327T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20170331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20210326T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20210326T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20230331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20320326T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20320326T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20340331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20370327T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20370327T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+022056
-TZOFFSETTO:+022040
-TZNAME:JMT
 DTSTART:18800101T000000
 RDATE:18800101T000000
+TZNAME:JMT
+TZOFFSETFROM:+022056
+TZOFFSETTO:+022040
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+022040
-TZOFFSETTO:+0200
-TZNAME:IST
 DTSTART:19180101T000000
 RDATE:19180101T000000
+TZNAME:IST
+TZOFFSETFROM:+022040
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
 DTSTART:19400601T000000
 RDATE:19400601T000000
 RDATE:19430401T020000
@@ -123,13 +60,19 @@
 RDATE:20050401T020000
 RDATE:20110401T020000
 RDATE:20160401T020000
-RDATE:20220401T020000
-RDATE:20330401T020000
+RDATE:20170331T020000
+TZNAME:IDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421101T000000
+RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z;BYMONTH=11
+TZNAME:IST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:IST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19451101T020000
 RDATE:19451101T020000
 RDATE:19461101T000000
@@ -146,6 +89,8 @@
 RDATE:19850915T000000
 RDATE:19860907T000000
 RDATE:19870913T000000
+RDATE:19880903T000000
+RDATE:19890903T000000
 RDATE:19900826T000000
 RDATE:19910901T000000
 RDATE:19920906T000000
@@ -174,40 +119,46 @@
 RDATE:20150920T020000
 RDATE:20161009T020000
 RDATE:20170924T020000
-RDATE:20180916T020000
-RDATE:20191006T020000
-RDATE:20200927T020000
-RDATE:20210912T020000
-RDATE:20221002T020000
-RDATE:20230924T020000
-RDATE:20241006T020000
-RDATE:20250928T020000
-RDATE:20260920T020000
-RDATE:20271010T020000
-RDATE:20280924T020000
-RDATE:20290916T020000
-RDATE:20301006T020000
-RDATE:20310921T020000
-RDATE:20320912T020000
-RDATE:20331002T020000
-RDATE:20340917T020000
-RDATE:20351007T020000
-RDATE:20360928T020000
-RDATE:20370913T020000
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0400
-TZNAME:IDDT
 DTSTART:19480523T000000
 RDATE:19480523T000000
+TZNAME:IDDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19480901T000000
+RDATE:19480901T000000
+TZNAME:IDT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19481101T020000
+RRULE:FREQ=YEARLY;UNTIL=19491031T230000Z;BYMONTH=11
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20060331T020000
+RRULE:FREQ=YEARLY;UNTIL=20100326T000000Z;BYDAY=FR;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=3
 TZNAME:IDT
-DTSTART:19480901T000000
-RDATE:19480901T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20120330T020000
+RRULE:FREQ=YEARLY;UNTIL=20150327T000000Z;BYDAY=FR;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=3
+TZNAME:IDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimbu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimbu.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimbu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Thimbu
 X-LIC-LOCATION:Asia/Thimbu
 BEGIN:STANDARD
+DTSTART:19470815T000000
+RDATE:19470815T000000
+TZNAME:IST
 TZOFFSETFROM:+055836
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19470815T000000
-RDATE:19470815T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19871001T000000
+RDATE:19871001T000000
+TZNAME:BTT
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0600
-TZNAME:BTT
-DTSTART:19871001T000000
-RDATE:19871001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimphu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimphu.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimphu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Thimphu
 X-LIC-LOCATION:Asia/Thimphu
 BEGIN:STANDARD
+DTSTART:19470815T000000
+RDATE:19470815T000000
+TZNAME:IST
 TZOFFSETFROM:+055836
 TZOFFSETTO:+0530
-TZNAME:IST
-DTSTART:19470815T000000
-RDATE:19470815T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19871001T000000
+RDATE:19871001T000000
+TZNAME:BTT
 TZOFFSETFROM:+0530
 TZOFFSETTO:+0600
-TZNAME:BTT
-DTSTART:19871001T000000
-RDATE:19871001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tokyo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tokyo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tokyo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,52 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Tokyo
 X-LIC-LOCATION:Asia/Tokyo
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
+DTSTART:18880101T001859
+RDATE:18880101T001859
 TZNAME:JST
-DTSTART:19480911T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=2SA;UNTIL=19510907T160000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-TZNAME:JDT
-DTSTART:19500507T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19510505T170000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+091859
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:18880101T001859
-RDATE:18880101T001859
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18960101T000000
+RDATE:18960101T000000
+TZNAME:CJT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:CJT
-DTSTART:18960101T000000
-RDATE:18960101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19380101T000000
+RDATE:19380101T000000
+TZNAME:JST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19380101T000000
-RDATE:19380101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-TZNAME:JDT
 DTSTART:19480502T020000
 RDATE:19480502T020000
 RDATE:19490403T020000
+TZNAME:JDT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19480911T020000
+RRULE:FREQ=YEARLY;UNTIL=19510907T160000Z;BYDAY=2SA;BYMONTH=9
+TZNAME:JST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19500507T020000
+RRULE:FREQ=YEARLY;UNTIL=19510505T170000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:JDT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ujung_Pandang.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ujung_Pandang.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ujung_Pandang.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Ujung_Pandang
 X-LIC-LOCATION:Asia/Ujung_Pandang
 BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:MMT
 TZOFFSETFROM:+075736
 TZOFFSETTO:+075736
-TZNAME:MMT
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:CIT
 TZOFFSETFROM:+075736
 TZOFFSETTO:+0800
-TZNAME:CIT
-DTSTART:19321101T000000
-RDATE:19321101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420209T000000
+RDATE:19420209T000000
+TZNAME:JST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420209T000000
-RDATE:19420209T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:CIT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CIT
-DTSTART:19450923T000000
-RDATE:19450923T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulaanbaatar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulaanbaatar.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulaanbaatar.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,71 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Ulaanbaatar
 X-LIC-LOCATION:Asia/Ulaanbaatar
+BEGIN:STANDARD
+DTSTART:19050801T000000
+RDATE:19050801T000000
+TZNAME:ULAT
+TZOFFSETFROM:+070732
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19780101T000000
+RDATE:19780101T000000
+TZNAME:ULAST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T160000Z;BYMONTH=4
+TZNAME:ULAST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19831001T000000
+RDATE:19831001T000000
+TZNAME:ULAT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T000000
+RRULE:FREQ=YEARLY;UNTIL=19980926T150000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:ULAT
-DTSTART:19840930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19980926T150000Z
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T000000
+RRULE:FREQ=YEARLY;UNTIL=19980328T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ULAST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:19850331T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T160000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-TZNAME:ULAT
-DTSTART:20010929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20060929T170000Z
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010428T020000
+RDATE:20010428T020000
+TZNAME:ULAST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:20020330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20060324T180000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+070732
-TZOFFSETTO:+0700
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;UNTIL=20060929T170000Z;BYDAY=-1SA;BYMONTH=9
 TZNAME:ULAT
-DTSTART:19050801T000000
-RDATE:19050801T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-TZNAME:ULAT
-DTSTART:19780101T000000
-RDATE:19780101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:ULAT
-DTSTART:19831001T000000
-RDATE:19831001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;UNTIL=20060324T180000Z;BYDAY=-1SA;BYMONTH=3
+TZNAME:ULAST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:20010428T020000
-RDATE:20010428T020000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulan_Bator.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulan_Bator.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulan_Bator.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,71 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Ulan_Bator
 X-LIC-LOCATION:Asia/Ulan_Bator
+BEGIN:STANDARD
+DTSTART:19050801T000000
+RDATE:19050801T000000
+TZNAME:ULAT
+TZOFFSETFROM:+070732
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19780101T000000
+RDATE:19780101T000000
+TZNAME:ULAST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T160000Z;BYMONTH=4
+TZNAME:ULAST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19831001T000000
+RDATE:19831001T000000
+TZNAME:ULAT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T000000
+RRULE:FREQ=YEARLY;UNTIL=19980926T150000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:ULAT
-DTSTART:19840930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19980926T150000Z
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T000000
+RRULE:FREQ=YEARLY;UNTIL=19980328T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ULAST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:19850331T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T160000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-TZNAME:ULAT
-DTSTART:20010929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SA;UNTIL=20060929T170000Z
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010428T020000
+RDATE:20010428T020000
+TZNAME:ULAST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:20020330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SA;UNTIL=20060324T180000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+070732
-TZOFFSETTO:+0700
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;UNTIL=20060929T170000Z;BYDAY=-1SA;BYMONTH=9
 TZNAME:ULAT
-DTSTART:19050801T000000
-RDATE:19050801T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-TZNAME:ULAT
-DTSTART:19780101T000000
-RDATE:19780101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:ULAT
-DTSTART:19831001T000000
-RDATE:19831001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;UNTIL=20060324T180000Z;BYDAY=-1SA;BYMONTH=3
+TZNAME:ULAST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:ULAST
-DTSTART:20010428T020000
-RDATE:20010428T020000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Urumqi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Urumqi.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Urumqi.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,45 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Urumqi
 X-LIC-LOCATION:Asia/Urumqi
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:URUT
+TZOFFSETFROM:+055020
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800501T000000
+RDATE:19800501T000000
+TZNAME:CST
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19860914T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19910914T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19860504T000000
+RDATE:19860504T000000
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19870412T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=10,11,12,13,14,15,16;BYDAY=SU;UNTIL=19910413T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+055020
-TZOFFSETTO:+0600
-TZNAME:URUT
-DTSTART:19280101T000000
-RDATE:19280101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0600
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;UNTIL=19910914T150000Z;BYDAY=SU;BYMONTHDAY=11,12,13,14,1
+ 5,16,17;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19800501T000000
-RDATE:19800501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870412T000000
+RRULE:FREQ=YEARLY;UNTIL=19910413T160000Z;BYDAY=-3SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19860504T000000
-RDATE:19860504T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vientiane.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vientiane.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vientiane.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Vientiane
 X-LIC-LOCATION:Asia/Vientiane
 BEGIN:STANDARD
+DTSTART:19060609T000000
+RDATE:19060609T000000
+TZNAME:SMT
 TZOFFSETFROM:+065024
 TZOFFSETTO:+070620
-TZNAME:SMT
-DTSTART:19060609T000000
-RDATE:19060609T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:ICT
 TZOFFSETFROM:+070620
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19110311T000100
-RDATE:19110311T000100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120501T000000
+RDATE:19120501T000000
+TZNAME:ICT
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0800
-TZNAME:ICT
-DTSTART:19120501T000000
-RDATE:19120501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19310501T000000
+RDATE:19310501T000000
+TZNAME:ICT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0700
-TZNAME:ICT
-DTSTART:19310501T000000
-RDATE:19310501T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vladivostok.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vladivostok.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vladivostok.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,100 +1,101 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Vladivostok
 X-LIC-LOCATION:Asia/Vladivostok
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-TZNAME:VLAST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T140000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
+DTSTART:19221115T000000
+RDATE:19221115T000000
 TZNAME:VLAT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T130000Z
+TZOFFSETFROM:+084744
+TZOFFSETTO:+0900
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:VLAST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+1000
-TZNAME:VLAT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T140000Z;BYMONTH=4
 TZNAME:VLAST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T160000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:VLAST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T130000Z;BYMONTH=10
 TZNAME:VLAT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T160000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:VLAT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+084744
-TZOFFSETTO:+0900
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T160000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:VLAT
-DTSTART:19221115T000000
-RDATE:19221115T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0900
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:VLAT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19920119T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:VLAST
 TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:VLASST
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
+TZNAME:VLASST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:VLAST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
 TZNAME:VLAST
-DTSTART:19910929T030000
-RDATE:19910929T030000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:VLAT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:VLAST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:VLAST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T160000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:VLAT
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:VLAT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yakutsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yakutsk.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yakutsk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,100 +1,101 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Yakutsk
 X-LIC-LOCATION:Asia/Yakutsk
+BEGIN:STANDARD
+DTSTART:19191215T000000
+RDATE:19191215T000000
+TZNAME:YAKT
+TZOFFSETFROM:+083840
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:YAKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T150000Z;BYMONTH=4
+TZNAME:YAKST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+1000
-TZNAME:YAKST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T150000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T140000Z;BYMONTH=10
+TZNAME:YAKT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+0900
-TZNAME:YAKT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T140000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T170000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:YAKT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+0900
-TZNAME:YAKT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T170000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T170000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:YAKST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T170000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+1000
-TZNAME:YAKST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:YAKST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:YAKT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T170000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
+DTSTART:19910929T030000
+RDATE:19910929T030000
 TZNAME:YAKT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+083840
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:YAKT
-DTSTART:19191215T000000
-RDATE:19191215T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:YAKT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19920119T020000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:YAKST
 TZOFFSETFROM:+0900
-TZOFFSETTO:+0900
-TZNAME:YAKST
-DTSTART:19910331T020000
-RDATE:19910331T020000
+TZOFFSETTO:+1000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:YAKT
-DTSTART:19910929T030000
-RDATE:19910929T030000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:YAKST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+1000
-TZNAME:YAKST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T170000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:YAKT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:YAKT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yekaterinburg.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yekaterinburg.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yekaterinburg.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,106 +1,107 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Yekaterinburg
 X-LIC-LOCATION:Asia/Yekaterinburg
+BEGIN:STANDARD
+DTSTART:19190715T040000
+RDATE:19190715T040000
+TZNAME:SVET
+TZOFFSETFROM:+040224
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:SVEST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:SVEST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:SVEST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:SVET
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:SVET
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:SVET
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:SVET
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:SVEST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T210000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:YEKST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:SVEST
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0500
-TZNAME:YEKT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-TZNAME:YEKT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+040224
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:SVET
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:SVET
-DTSTART:19190715T040000
-RDATE:19190715T040000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:YEKST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:SVET
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:YEKST
 TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-TZNAME:SVEST
-DTSTART:19910331T020000
-RDATE:19910331T020000
+TZOFFSETTO:+0600
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:SVET
-DTSTART:19910929T030000
-RDATE:19910929T030000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:YEKT
+TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
-TZNAME:YEKT
-DTSTART:19920119T020000
-RDATE:19920119T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:YEKST
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:YEKST
-DTSTART:19920328T230000
-RDATE:19920328T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:YEKT
 TZOFFSETFROM:+0600
 TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:YEKT
-DTSTART:19920926T230000
-RDATE:19920926T230000
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yerevan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yerevan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yerevan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,115 +1,116 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Asia/Yerevan
 X-LIC-LOCATION:Asia/Yerevan
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:YERST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
+DTSTART:19240502T000000
+RDATE:19240502T000000
 TZNAME:YERT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
+TZOFFSETFROM:+0258
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:YERT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T220000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
+DTSTART:19570301T000000
+RDATE:19570301T000000
 TZNAME:YERST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T220000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:AMST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19950325T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:AMT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19940924T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
+TZNAME:YERST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:AMST
-DTSTART:19970330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:YERT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:AMT
-DTSTART:19971026T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0258
-TZOFFSETTO:+0300
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:YERT
-DTSTART:19240502T000000
-RDATE:19240502T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:YERT
-DTSTART:19570301T000000
-RDATE:19570301T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:YERST
 TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-TZNAME:YERST
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+TZNAME:YERST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:AMST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19910923T000000
 RDATE:19910923T000000
-END:DAYLIGHT
+RDATE:19970101T000000
+TZNAME:AMST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:AMT
 DTSTART:19910929T030000
 RDATE:19910929T030000
 RDATE:19920926T230000
+TZNAME:AMT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:AMST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=19950325T230000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:AMST
-DTSTART:19920328T230000
-RDATE:19920328T230000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19940924T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AMT
 TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-TZNAME:AMT
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19950924T030000
 RDATE:19950924T030000
-RDATE:19970101T000000
+TZNAME:AMT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:AMST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19971026T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:AMT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Azores.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Azores.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Azores.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,254 +1,266 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Azores
 X-LIC-LOCATION:Atlantic/Azores
 BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:HMT
+TZOFFSETFROM:-014240
+TZOFFSETTO:-015432
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110524T000000
+RDATE:19110524T000000
+TZNAME:AZOST
+TZOFFSETFROM:-015432
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160617T230000
+RDATE:19160617T230000
+RDATE:19170228T230000
+RDATE:19180301T230000
+RDATE:19190228T230000
+RDATE:19200229T230000
+RDATE:19210228T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+RDATE:19380326T230000
+RDATE:19390415T230000
+RDATE:19400224T230000
+RDATE:19410405T230000
+RDATE:19460406T230000
+TZNAME:AZOST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161101T010000
+RDATE:19161101T010000
+RDATE:19241015T000000
+RDATE:19391119T000000
+RDATE:19461006T000000
+TZNAME:AZOT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19171015T000000
+RRULE:FREQ=YEARLY;UNTIL=19211015T010000Z;BYMONTH=10
 TZNAME:AZOT
-DTSTART:19171015T000000
-RRULE:FREQ=YEARLY;UNTIL=19211015T010000Z
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291006T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:AZOT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19261003T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19291006T010000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;UNTIL=19321002T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:AZOT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19311004T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19321002T010000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;UNTIL=19381002T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:AZOT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19341007T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T010000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411006T010000Z;BYMONTH=10
+TZNAME:AZOT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19401006T000000
-RRULE:FREQ=YEARLY;UNTIL=19411006T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420314T230000
+RRULE:FREQ=YEARLY;UNTIL=19450311T010000Z;BYDAY=2SA;BYMONTH=3
+TZNAME:AZOST
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420425T230000
+RDATE:19420425T230000
+RDATE:19430417T230000
+TZNAME:AZOMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420816T000000
+RDATE:19420816T000000
 TZNAME:AZOST
-DTSTART:19420314T230000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19450311T010000Z
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;UNTIL=19451028T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AZOT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19421025T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19451028T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19430829T000000
+RRULE:FREQ=YEARLY;UNTIL=19450826T000000Z;BYDAY=SU;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=8
+TZNAME:AZOST
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:AZOST
-DTSTART:19430829T000000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=26,27,28,29,30,31;BYDAY=SU;UNTIL=19450826T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=1;BYDAY=SU;UNTIL=19450826T000000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19440422T230000
+RRULE:FREQ=YEARLY;UNTIL=19450422T000000Z;BYDAY=SA;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=4
+TZNAME:AZOMT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:AZOMT
-DTSTART:19440422T230000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SA;UNTIL=19450422T000000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;UNTIL=19490403T040000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AZOST
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0100
-TZNAME:AZOST
-DTSTART:19470406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19490403T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:AZOT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;UNTIL=19650404T040000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AZOST
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0100
-TZNAME:AZOST
-DTSTART:19510401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19650404T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;UNTIL=19651003T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:AZOT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19511007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19651003T040000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660403T020000
+RDATE:19660403T020000
+TZNAME:AZOST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19770327T000000
+RDATE:19770327T000000
+RDATE:19800330T000000
+RDATE:19830327T020000
+TZNAME:AZOST
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:AZOST
-DTSTART:19780402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19790401T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19770925T010000
+RDATE:19770925T010000
+RDATE:19781001T010000
+TZNAME:AZOT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:AZOT
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19910929T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;UNTIL=19790401T010000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:AZOST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:AZOST
-DTSTART:19840325T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19920329T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19820926T020000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AZOT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:AZOT
-DTSTART:19930926T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19820328T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:AZOST
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:AZOST
-DTSTART:19940327T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830925T020000
+RRULE:FREQ=YEARLY;UNTIL=19910929T020000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AZOT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:AZOT
-DTSTART:19961027T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-014240
-TZOFFSETTO:-015432
-TZNAME:HMT
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-015432
-TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19110524T000000
-RDATE:19110524T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;UNTIL=19920329T020000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:AZOST
-DTSTART:19160617T230000
-RDATE:19160617T230000
-RDATE:19170228T230000
-RDATE:19180301T230000
-RDATE:19190228T230000
-RDATE:19200229T230000
-RDATE:19210228T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19310418T230000
-RDATE:19320402T230000
-RDATE:19340407T230000
-RDATE:19350330T230000
-RDATE:19360418T230000
-RDATE:19370403T230000
-RDATE:19380326T230000
-RDATE:19390415T230000
-RDATE:19400224T230000
-RDATE:19410405T230000
-RDATE:19460406T230000
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19161101T010000
-RDATE:19161101T010000
-RDATE:19241015T000000
-RDATE:19391119T000000
-RDATE:19461006T000000
+DTSTART:19920927T020000
+RDATE:19920927T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
+DTSTART:19930328T010000
+RDATE:19930328T010000
+TZNAME:AZOST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-TZNAME:AZOMT
-DTSTART:19420425T230000
-RDATE:19420425T230000
-RDATE:19430417T230000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T010000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AZOT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:AZOST
-DTSTART:19420816T000000
-RDATE:19420816T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:AZOT
-DTSTART:19660403T020000
-RDATE:19660403T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19940327T000000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:AZOST
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:AZOST
-DTSTART:19770327T000000
-RDATE:19770327T000000
-RDATE:19800330T000000
-RDATE:19830327T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:AZOT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:AZOT
-DTSTART:19770925T010000
-RDATE:19770925T010000
-RDATE:19781001T010000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19920927T020000
-RDATE:19920927T020000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:AZOST
-DTSTART:19930328T010000
-RDATE:19930328T010000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Bermuda.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Bermuda.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Bermuda.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Bermuda
 X-LIC-LOCATION:Atlantic/Bermuda
+BEGIN:STANDARD
+DTSTART:19300101T020000
+RDATE:19300101T020000
+TZNAME:AST
+TZOFFSETFROM:-041904
+TZOFFSETTO:-0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19750427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19740428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=19751026T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19760101T000000
+RDATE:19760101T000000
 TZNAME:AST
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19761031T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T060000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:ADT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AST
 DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041904
-TZOFFSETTO:-0400
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:AST
-DTSTART:19300101T020000
-RDATE:19300101T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19760101T000000
-RDATE:19760101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Canary.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Canary.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Canary.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Canary
 X-LIC-LOCATION:Atlantic/Canary
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19220301T000000
+RDATE:19220301T000000
+TZNAME:CANT
+TZOFFSETFROM:-010136
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460930T010000
+RDATE:19460930T010000
+TZNAME:WET
+TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19800928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19800406T000000
+RDATE:19800406T000000
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T010000
+RDATE:19800928T010000
 TZNAME:WEST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-010136
-TZOFFSETTO:-0100
-TZNAME:CANT
-DTSTART:19220301T000000
-RDATE:19220301T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
+DTSTART:19800928T020000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19460930T010000
-RDATE:19460930T010000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19800406T000000
-RDATE:19800406T000000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19800928T010000
-RDATE:19800928T010000
-END:DAYLIGHT
+TZOFFSETTO:+0000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Cape_Verde.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Cape_Verde.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Cape_Verde.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Cape_Verde
 X-LIC-LOCATION:Atlantic/Cape_Verde
 BEGIN:STANDARD
+DTSTART:19070101T000000
+RDATE:19070101T000000
+TZNAME:CVT
 TZOFFSETFROM:-013404
 TZOFFSETTO:-0200
-TZNAME:CVT
-DTSTART:19070101T000000
-RDATE:19070101T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:CVST
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0100
-TZNAME:CVST
-DTSTART:19420901T000000
-RDATE:19420901T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19451015T000000
+RDATE:19451015T000000
+TZNAME:CVT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:CVT
-DTSTART:19451015T000000
-RDATE:19451015T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19751125T020000
+RDATE:19751125T020000
+TZNAME:CVT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0100
-TZNAME:CVT
-DTSTART:19751125T020000
-RDATE:19751125T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faeroe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faeroe.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faeroe.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Faeroe
 X-LIC-LOCATION:Atlantic/Faeroe
+BEGIN:STANDARD
+DTSTART:19080111T000000
+RDATE:19080111T000000
+TZNAME:WET
+TZOFFSETFROM:-002704
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810101T000000
+RDATE:19810101T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19810927T020000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19810927T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
 DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-002704
-TZOFFSETTO:+0000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:WET
-DTSTART:19080111T000000
-RDATE:19080111T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19810101T000000
-RDATE:19810101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faroe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faroe.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faroe.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Faroe
 X-LIC-LOCATION:Atlantic/Faroe
+BEGIN:STANDARD
+DTSTART:19080111T000000
+RDATE:19080111T000000
+TZNAME:WET
+TZOFFSETFROM:-002704
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810101T000000
+RDATE:19810101T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19810927T020000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19810927T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
 DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-002704
-TZOFFSETTO:+0000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:WET
-DTSTART:19080111T000000
-RDATE:19080111T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19810101T000000
-RDATE:19810101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Jan_Mayen.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Jan_Mayen.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Jan_Mayen.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,81 +1,88 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Jan_Mayen
 X-LIC-LOCATION:Atlantic/Jan_Mayen
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0043
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160522T010000
+RDATE:19160522T010000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19650425T020000
+RDATE:19800406T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19590315T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19640315T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19160930T000000
+RDATE:19160930T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451001T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19590920T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19650919T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+DTSTART:19400810T230000
+RDATE:19400810T230000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19590315T020000
+RRULE:FREQ=YEARLY;UNTIL=19640315T010000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19590920T030000
+RRULE:FREQ=YEARLY;UNTIL=19650919T010000Z;BYDAY=3SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0043
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
-DTSTART:18950101T000000
-RDATE:18950101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19160522T010000
-RDATE:19160522T010000
-RDATE:19400810T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19650425T020000
-RDATE:19800406T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19160930T000000
-RDATE:19160930T000000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451001T030000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800101T000000
-RDATE:19800101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Madeira.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Madeira.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Madeira.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,233 +1,238 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Madeira
 X-LIC-LOCATION:Atlantic/Madeira
 BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:FMT
+TZOFFSETFROM:-010736
+TZOFFSETTO:-010736
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110524T000000
+RDATE:19110524T000000
+TZNAME:MADST
+TZOFFSETFROM:-010736
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160617T230000
+RDATE:19160617T230000
+RDATE:19170228T230000
+RDATE:19180301T230000
+RDATE:19190228T230000
+RDATE:19200229T230000
+RDATE:19210228T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+RDATE:19380326T230000
+RDATE:19390415T230000
+RDATE:19400224T230000
+RDATE:19410405T230000
+RDATE:19460406T230000
+TZNAME:MADST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161101T010000
+RDATE:19161101T010000
+RDATE:19241015T000000
+RDATE:19391119T000000
+RDATE:19461006T000000
+TZNAME:MADT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19171015T000000
+RRULE:FREQ=YEARLY;UNTIL=19211015T000000Z;BYMONTH=10
 TZNAME:MADT
-DTSTART:19171015T000000
-RRULE:FREQ=YEARLY;UNTIL=19211015T000000Z
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291006T000000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:MADT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19261003T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19291006T000000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;UNTIL=19321002T000000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:MADT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19311004T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19321002T000000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;UNTIL=19381002T000000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:MADT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19341007T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T000000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411006T000000Z;BYMONTH=10
+TZNAME:MADT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19401006T000000
-RRULE:FREQ=YEARLY;UNTIL=19411006T000000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420314T230000
+RRULE:FREQ=YEARLY;UNTIL=19450311T000000Z;BYDAY=2SA;BYMONTH=3
+TZNAME:MADST
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420425T230000
+RDATE:19420425T230000
+RDATE:19430417T230000
+TZNAME:MADMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420816T000000
+RDATE:19420816T000000
 TZNAME:MADST
-DTSTART:19420314T230000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19450311T000000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;UNTIL=19451028T000000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MADT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19421025T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19451028T000000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19430829T000000
+RRULE:FREQ=YEARLY;UNTIL=19450825T230000Z;BYDAY=SU;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=8
+TZNAME:MADST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:MADST
-DTSTART:19430829T000000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=26,27,28,29,30,31;BYDAY=SU;UNTIL=19450825T230000Z
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=1;BYDAY=SU;UNTIL=19450825T230000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19440422T230000
+RRULE:FREQ=YEARLY;UNTIL=19450421T230000Z;BYDAY=SA;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=4
+TZNAME:MADMT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:MADMT
-DTSTART:19440422T230000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SA;UNTIL=19450421T230000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;UNTIL=19490403T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MADST
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:MADST
-DTSTART:19470406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19490403T030000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T030000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MADT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;UNTIL=19650404T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MADST
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:MADST
-DTSTART:19510401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19650404T030000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;UNTIL=19651003T030000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MADT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19511007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19651003T030000Z
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
+BEGIN:STANDARD
+DTSTART:19660403T020000
+RDATE:19660403T020000
 TZNAME:WEST
-DTSTART:19780402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19790401T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19820926T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19770327T000000
+RDATE:19770327T000000
+RDATE:19800330T000000
+RDATE:19830327T020000
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19770925T010000
+RDATE:19770925T010000
+RDATE:19781001T010000
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19830925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;UNTIL=19790401T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19840325T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19820926T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-010736
-TZOFFSETTO:-010736
-TZNAME:FMT
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-010736
-TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19110524T000000
-RDATE:19110524T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:MADST
-DTSTART:19160617T230000
-RDATE:19160617T230000
-RDATE:19170228T230000
-RDATE:19180301T230000
-RDATE:19190228T230000
-RDATE:19200229T230000
-RDATE:19210228T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19310418T230000
-RDATE:19320402T230000
-RDATE:19340407T230000
-RDATE:19350330T230000
-RDATE:19360418T230000
-RDATE:19370403T230000
-RDATE:19380326T230000
-RDATE:19390415T230000
-RDATE:19400224T230000
-RDATE:19410405T230000
-RDATE:19460406T230000
-END:DAYLIGHT
-BEGIN:STANDARD
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19820328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19161101T010000
-RDATE:19161101T010000
-RDATE:19241015T000000
-RDATE:19391119T000000
-RDATE:19461006T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:MADMT
-DTSTART:19420425T230000
-RDATE:19420425T230000
-RDATE:19430417T230000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T020000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:MADST
-DTSTART:19420816T000000
-RDATE:19420816T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19660403T020000
-RDATE:19660403T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19770327T000000
-RDATE:19770327T000000
-RDATE:19800330T000000
-RDATE:19830327T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19770925T010000
-RDATE:19770925T010000
-RDATE:19781001T010000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Reykjavik.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Reykjavik.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Reykjavik.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,62 +1,32 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Reykjavik
 X-LIC-LOCATION:Atlantic/Reykjavik
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:ISST
-DTSTART:19170219T230000
-RRULE:FREQ=YEARLY;UNTIL=19180220T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:ISST
-DTSTART:19430307T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19460303T020000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:IST
-DTSTART:19431024T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19481024T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:ISST
-DTSTART:19470406T010000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19670402T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:IST
-DTSTART:19501022T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19661023T020000Z
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18370101T000000
+RDATE:18370101T000000
+TZNAME:RMT
 TZOFFSETFROM:-012724
 TZOFFSETTO:-012748
-TZNAME:RMT
-DTSTART:18370101T000000
-RDATE:18370101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19080101T000000
+RDATE:19080101T000000
+TZNAME:ISST
 TZOFFSETFROM:-012748
 TZOFFSETTO:-0100
-TZNAME:IST
-DTSTART:19080101T000000
-RDATE:19080101T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170219T230000
+RRULE:FREQ=YEARLY;UNTIL=19180220T000000Z;BYMONTH=2
+TZNAME:ISST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:IST
 DTSTART:19171021T010000
 RDATE:19171021T010000
 RDATE:19181116T010000
@@ -66,23 +36,54 @@
 RDATE:19421025T020000
 RDATE:19491030T020000
 RDATE:19671029T020000
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:ISST
 DTSTART:19390429T230000
 RDATE:19390429T230000
 RDATE:19400225T020000
 RDATE:19410302T010000
 RDATE:19420308T010000
+TZNAME:ISST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19430307T010000
+RRULE:FREQ=YEARLY;UNTIL=19460303T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ISST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19431024T020000
+RRULE:FREQ=YEARLY;UNTIL=19481024T020000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470406T010000
+RRULE:FREQ=YEARLY;UNTIL=19670402T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ISST
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19501022T020000
+RRULE:FREQ=YEARLY;UNTIL=19661023T020000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19680407T010000
 RDATE:19680407T010000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/South_Georgia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/South_Georgia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/South_Georgia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/South_Georgia
 X-LIC-LOCATION:Atlantic/South_Georgia
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:GST
 TZOFFSETFROM:-022608
 TZOFFSETTO:-0200
-TZNAME:GST
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/St_Helena.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/St_Helena.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/St_Helena.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/St_Helena
 X-LIC-LOCATION:Atlantic/St_Helena
 BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:JMT
 TZOFFSETFROM:-002248
 TZOFFSETTO:-002248
-TZNAME:JMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:GMT
 TZOFFSETFROM:-002248
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19510101T000000
-RDATE:19510101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Stanley.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Stanley.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Stanley.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,114 +1,118 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Atlantic/Stanley
 X-LIC-LOCATION:Atlantic/Stanley
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:SMT
+TZOFFSETFROM:-035124
+TZOFFSETTO:-035124
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120312T000000
+RDATE:19120312T000000
 TZNAME:FKST
-DTSTART:19370926T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19380925T040000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-035124
 TZOFFSETTO:-0400
-TZNAME:FKT
-DTSTART:19380320T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19420322T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19370926T000000
+RRULE:FREQ=YEARLY;UNTIL=19380925T040000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:FKST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:FKST
-DTSTART:19400929T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19420927T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19380320T000000
+RRULE:FREQ=YEARLY;UNTIL=19420322T030000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
 TZNAME:FKT
-DTSTART:19840429T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19850428T020000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:FKT
-DTSTART:19860420T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=20000416T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19391001T000000
+RDATE:19391001T000000
+TZNAME:FKST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19400929T000000
+RRULE:FREQ=YEARLY;UNTIL=19420927T040000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:FKST
-DTSTART:19860914T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=20000910T040000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19430101T000000
+RDATE:19430101T000000
+TZNAME:FKT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:FKT
-DTSTART:20010415T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830501T000000
+RDATE:19830501T000000
+TZNAME:FKST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830925T000000
+RDATE:19830925T000000
+RDATE:19840916T000000
 TZNAME:FKST
-DTSTART:20010902T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-035124
-TZOFFSETTO:-035124
-TZNAME:SMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
+DTSTART:19840429T000000
+RRULE:FREQ=YEARLY;UNTIL=19850428T020000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:FKT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-035124
+DTSTART:19850915T000000
+RDATE:19850915T000000
+TZNAME:FKST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860420T000000
+RRULE:FREQ=YEARLY;UNTIL=20000416T030000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:FKT
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:FKT
-DTSTART:19120312T000000
-RDATE:19120312T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;UNTIL=20000910T040000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=9
+TZNAME:FKST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:FKST
-DTSTART:19391001T000000
-RDATE:19391001T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20010415T020000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=4
+TZNAME:FKT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:FKT
-DTSTART:19430101T000000
-RDATE:19430101T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:FKT
-DTSTART:19830501T000000
-RDATE:19830501T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+DTSTART:20010902T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=9
 TZNAME:FKST
-DTSTART:19830925T000000
-RDATE:19830925T000000
-RDATE:19840916T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:FKST
-DTSTART:19850915T000000
-RDATE:19850915T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/ACT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/ACT.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/ACT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,123 +1,124 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/ACT
 X-LIC-LOCATION:Australia/ACT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+100452
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19830306T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T160000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:19710101T000000
+RDATE:19710101T000000
+TZNAME:EST
+TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T160000Z
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19890318T160000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19960331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19950304T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+100452
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Adelaide.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Adelaide.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Adelaide.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,112 +1,112 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Adelaide
 X-LIC-LOCATION:Australia/Adelaide
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
+DTSTART:18950201T000000
+RDATE:18950201T000000
 TZNAME:CST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T153000Z
+TZOFFSETFROM:+091420
+TZOFFSETTO:+0900
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:18990501T000000
+RDATE:18990501T000000
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0930
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T163000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19910303T030000
+RDATE:19920322T030000
+RDATE:19930307T030000
+RDATE:19940320T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T153000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19710101T000000
+RDATE:19710101T000000
 TZNAME:CST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T163000Z
+TZOFFSETFROM:+0930
+TZOFFSETTO:+0930
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T163000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19950326T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T163000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+091420
-TZOFFSETTO:+0900
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T163000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:CST
-DTSTART:18950201T000000
-RDATE:18950201T000000
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CST
+TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:18990501T000000
-RDATE:18990501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19900318T030000
-RDATE:19910303T030000
-RDATE:19920322T030000
-RDATE:19930307T030000
-RDATE:19940320T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0930
-TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Brisbane.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Brisbane.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Brisbane.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,63 +1,64 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Brisbane
 X-LIC-LOCATION:Australia/Brisbane
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
+DTSTART:18950101T000000
+RDATE:18950101T000000
 TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19891029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19911026T160000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19920229T160000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+101208
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950101T000000
-RDATE:18950101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-TZNAME:EST
 DTSTART:19170101T000100
 RDATE:19170101T000100
 RDATE:19420101T020000
 RDATE:19420927T020000
 RDATE:19431003T020000
 RDATE:19711031T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
 DTSTART:19170325T020000
 RDATE:19170325T020000
 RDATE:19420329T020000
 RDATE:19720227T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19710101T000000
 RDATE:19710101T000000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891029T020000
+RRULE:FREQ=YEARLY;UNTIL=19911026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19920229T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Broken_Hill.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Broken_Hill.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Broken_Hill.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,136 +1,151 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Broken_Hill
 X-LIC-LOCATION:Australia/Broken_Hill
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+092548
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18960823T000000
+RDATE:18960823T000000
 TZNAME:CST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T153000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:18990501T000000
+RDATE:18990501T000000
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0930
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T163000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T153000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19830306T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T163000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
+DTSTART:19710101T000000
+RDATE:19710101T000000
+TZNAME:CST
+TZOFFSETFROM:+0930
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T163000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T163000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19960331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19890318T163000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+092548
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19950304T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;UNTIL=19990327T163000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:CST
-DTSTART:18960823T000000
-RDATE:18960823T000000
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0930
+DTSTART:20000101T000000
+RDATE:20000101T000000
 TZNAME:CST
-DTSTART:18990501T000000
-RDATE:18990501T000000
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1030
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000326T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T163000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20001029T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0930
-TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1030
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:20000101T000000
-RDATE:20000101T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Canberra.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Canberra.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Canberra.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,123 +1,124 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Canberra
 X-LIC-LOCATION:Australia/Canberra
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+100452
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19830306T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T160000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:19710101T000000
+RDATE:19710101T000000
+TZNAME:EST
+TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T160000Z
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19890318T160000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19960331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19950304T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+100452
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Currie.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Currie.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Currie.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,137 +1,137 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Currie
 X-LIC-LOCATION:Australia/Currie
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950901T000000
+RDATE:18950901T000000
+TZNAME:EST
+TZOFFSETFROM:+093528
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19161001T020000
+RDATE:19161001T020000
 TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
+DTSTART:19170201T000000
+RDATE:19170201T000000
 TZNAME:EST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19820328T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19830326T160000Z
+TZOFFSETTO:+1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
 TZNAME:EST
-DTSTART:19840304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19860301T160000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19870315T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420101T020000
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:19871025T020000
+RDATE:20000827T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19881030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901027T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19710701T000000
+RDATE:19710701T000000
 TZNAME:EST
-DTSTART:19910331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20030329T160000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:19911006T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19991002T160000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20011007T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820328T030000
+RRULE:FREQ=YEARLY;UNTIL=19830326T160000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20040328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+DTSTART:19840304T030000
+RRULE:FREQ=YEARLY;UNTIL=19860301T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870315T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20080406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;UNTIL=19901027T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+093528
+DTSTART:19910331T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950901T000000
-RDATE:18950901T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19911006T020000
+RRULE:FREQ=YEARLY;UNTIL=19991002T160000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19161001T020000
-RDATE:19161001T020000
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
-RDATE:19871025T020000
-RDATE:20000827T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1100
+DTSTART:20011007T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170201T000000
-RDATE:19170201T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19710701T000000
-RDATE:19710701T000000
-RDATE:20060402T020000
-RDATE:20070325T020000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Darwin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Darwin.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Darwin.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,47 +1,48 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Darwin
 X-LIC-LOCATION:Australia/Darwin
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
+DTSTART:18950201T000000
+RDATE:18950201T000000
 TZNAME:CST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T153000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+084320
 TZOFFSETTO:+0900
-TZNAME:CST
-DTSTART:18950201T000000
-RDATE:18950201T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18990501T000000
+RDATE:18990501T000000
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:18990501T000000
-RDATE:18990501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-TZNAME:CST
 DTSTART:19170101T000100
 RDATE:19170101T000100
 RDATE:19420101T020000
 RDATE:19420927T020000
 RDATE:19431003T020000
+TZNAME:CST
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-TZNAME:CST
 DTSTART:19170325T020000
 RDATE:19170325T020000
 RDATE:19420329T020000
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T153000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Eucla.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Eucla.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Eucla.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,34 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Eucla
 X-LIC-LOCATION:Australia/Eucla
 BEGIN:STANDARD
-TZOFFSETFROM:+0945
-TZOFFSETTO:+0845
+DTSTART:18951201T000000
+RDATE:18951201T000000
 TZNAME:CWST
-DTSTART:20070325T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20090328T171500Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0845
-TZOFFSETTO:+0945
-TZNAME:CWST
-DTSTART:20071028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20081025T171500Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+083528
 TZOFFSETTO:+0845
-TZNAME:CWST
-DTSTART:18951201T000000
-RDATE:18951201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0845
-TZOFFSETTO:+0945
-TZNAME:CWST
 DTSTART:19170101T000100
 RDATE:19170101T000100
 RDATE:19420101T020000
@@ -37,11 +21,11 @@
 RDATE:19831030T020000
 RDATE:19911117T020000
 RDATE:20061203T020000
+TZNAME:CWST
+TZOFFSETFROM:+0845
+TZOFFSETTO:+0945
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0945
-TZOFFSETTO:+0845
-TZNAME:CWST
 DTSTART:19170325T020000
 RDATE:19170325T020000
 RDATE:19420329T020000
@@ -49,13 +33,30 @@
 RDATE:19750302T030000
 RDATE:19840304T030000
 RDATE:19920301T030000
+TZNAME:CWST
+TZOFFSETFROM:+0945
+TZOFFSETTO:+0845
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430701T000000
+RDATE:19430701T000000
+TZNAME:CWST
 TZOFFSETFROM:+0845
 TZOFFSETTO:+0845
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20070325T030000
+RRULE:FREQ=YEARLY;UNTIL=20090328T171500Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:CWST
-DTSTART:19430701T000000
-RDATE:19430701T000000
+TZOFFSETFROM:+0945
+TZOFFSETTO:+0845
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20071028T020000
+RRULE:FREQ=YEARLY;UNTIL=20081025T171500Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CWST
+TZOFFSETFROM:+0845
+TZOFFSETTO:+0945
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Hobart.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Hobart.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Hobart.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,146 +1,146 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Hobart
 X-LIC-LOCATION:Australia/Hobart
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950901T000000
+RDATE:18950901T000000
+TZNAME:EST
+TZOFFSETFROM:+094916
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19161001T020000
+RDATE:19161001T020000
 TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19170201T000000
+RDATE:19170201T000000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19680331T030000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420101T020000
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19671001T020000
+RDATE:19861019T020000
+RDATE:19871025T020000
+RDATE:20000827T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19681027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19670101T000000
+RDATE:19670101T000000
 TZNAME:EST
-DTSTART:19690309T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=19710313T160000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19690309T030000
+RRULE:FREQ=YEARLY;UNTIL=19710313T160000Z;BYDAY=2SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19820328T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19830326T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19820328T030000
+RRULE:FREQ=YEARLY;UNTIL=19830326T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19840304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19860301T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840304T030000
+RRULE:FREQ=YEARLY;UNTIL=19860301T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19870315T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T160000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
+RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:EST
-DTSTART:19881030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901027T160000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19910331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20030329T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;UNTIL=19901027T160000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:19911006T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19991002T160000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20011007T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
+DTSTART:19910331T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20040328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:20080406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+094916
-TZOFFSETTO:+1000
+BEGIN:DAYLIGHT
+DTSTART:19911006T020000
+RRULE:FREQ=YEARLY;UNTIL=19991002T160000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:18950901T000000
-RDATE:18950901T000000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19161001T020000
-RDATE:19161001T020000
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19671001T020000
-RDATE:19861019T020000
-RDATE:19871025T020000
-RDATE:20000827T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1100
+DTSTART:20011007T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170201T000000
-RDATE:19170201T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19680331T030000
-RDATE:19720227T030000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19670101T000000
-RDATE:19670101T000000
-RDATE:20060402T020000
-RDATE:20070325T020000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/LHI.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/LHI.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/LHI.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,102 +1,103 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/LHI
 X-LIC-LOCATION:Australia/LHI
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+103620
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810301T000000
+RDATE:19810301T000000
+TZNAME:LHST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1030
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19841027T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1130
-TZNAME:LHST
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19841027T153000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19820307T020000
+RRULE:FREQ=YEARLY;UNTIL=19850302T143000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:LHST
 TZOFFSETFROM:+1130
 TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19851027T020000
+RDATE:19851027T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
 TZNAME:LHST
-DTSTART:19820307T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T143000Z
-END:STANDARD
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19860316T020000
+RRULE:FREQ=YEARLY;UNTIL=19890318T150000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:LHST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
-TZNAME:LHST
-DTSTART:19860316T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1100
-TZNAME:LHST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T153000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19900304T020000
+RRULE:FREQ=YEARLY;UNTIL=19950304T150000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:LHST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
-TZNAME:LHST
-DTSTART:19900304T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T150000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19960331T020000
+RRULE:FREQ=YEARLY;UNTIL=20050326T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:LHST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
-TZNAME:LHST
-DTSTART:19960331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1100
-TZNAME:LHST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T153000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20060402T020000
+RDATE:20060402T020000
+RDATE:20070325T020000
+TZNAME:LHST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080406T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
 TZNAME:LHST
-DTSTART:20080406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1030
-TZOFFSETTO:+1100
-TZNAME:LHST
 DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+103620
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1030
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
 TZNAME:LHST
-DTSTART:19810301T000000
-RDATE:19810301T000000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1100
-TZNAME:LHST
-DTSTART:19851027T020000
-RDATE:19851027T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1030
-TZNAME:LHST
-DTSTART:20060402T020000
-RDATE:20060402T020000
-RDATE:20070325T020000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lindeman.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lindeman.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lindeman.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,79 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Lindeman
 X-LIC-LOCATION:Australia/Lindeman
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:EST
+TZOFFSETFROM:+095556
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19711031T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19891029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19931030T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19940305T160000Z
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+095556
+DTSTART:19710101T000000
+RDATE:19710101T000000
+RDATE:19920701T000000
+TZNAME:EST
+TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950101T000000
-RDATE:18950101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19891029T020000
+RRULE:FREQ=YEARLY;UNTIL=19911026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19711031T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19920229T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19921025T020000
+RRULE:FREQ=YEARLY;UNTIL=19931030T160000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-END:STANDARD
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+DTSTART:19930307T030000
+RRULE:FREQ=YEARLY;UNTIL=19940305T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-RDATE:19920701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lord_Howe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lord_Howe.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lord_Howe.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,102 +1,103 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Lord_Howe
 X-LIC-LOCATION:Australia/Lord_Howe
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+103620
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810301T000000
+RDATE:19810301T000000
+TZNAME:LHST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1030
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19841027T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1130
-TZNAME:LHST
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19841027T153000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19820307T020000
+RRULE:FREQ=YEARLY;UNTIL=19850302T143000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:LHST
 TZOFFSETFROM:+1130
 TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19851027T020000
+RDATE:19851027T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
 TZNAME:LHST
-DTSTART:19820307T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T143000Z
-END:STANDARD
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19860316T020000
+RRULE:FREQ=YEARLY;UNTIL=19890318T150000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:LHST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
-TZNAME:LHST
-DTSTART:19860316T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1100
-TZNAME:LHST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T153000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19900304T020000
+RRULE:FREQ=YEARLY;UNTIL=19950304T150000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:LHST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
-TZNAME:LHST
-DTSTART:19900304T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T150000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19960331T020000
+RRULE:FREQ=YEARLY;UNTIL=20050326T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:LHST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
-TZNAME:LHST
-DTSTART:19960331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1100
-TZNAME:LHST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T153000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20060402T020000
+RDATE:20060402T020000
+RDATE:20070325T020000
+TZNAME:LHST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080406T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
 TZNAME:LHST
-DTSTART:20080406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1030
-TZOFFSETTO:+1100
-TZNAME:LHST
 DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+103620
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1030
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
 TZNAME:LHST
-DTSTART:19810301T000000
-RDATE:19810301T000000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1030
 TZOFFSETTO:+1100
-TZNAME:LHST
-DTSTART:19851027T020000
-RDATE:19851027T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1030
-TZNAME:LHST
-DTSTART:20060402T020000
-RDATE:20060402T020000
-RDATE:20070325T020000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Melbourne.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Melbourne.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Melbourne.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,121 +1,122 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Melbourne
 X-LIC-LOCATION:Australia/Melbourne
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+093952
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:20000827T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19710101T000000
+RDATE:19710101T000000
 TZNAME:EST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T160000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:19861019T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19871017T160000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19881030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19910303T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19940305T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19950326T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19861019T020000
+RRULE:FREQ=YEARLY;UNTIL=19871017T160000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T160000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910303T030000
+RRULE:FREQ=YEARLY;UNTIL=19940305T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+093952
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:20000827T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/NSW.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/NSW.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/NSW.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,123 +1,124 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/NSW
 X-LIC-LOCATION:Australia/NSW
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+100452
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19830306T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T160000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:19710101T000000
+RDATE:19710101T000000
+TZNAME:EST
+TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T160000Z
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19890318T160000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19960331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19950304T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+100452
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/North.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/North.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/North.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,47 +1,48 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/North
 X-LIC-LOCATION:Australia/North
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
+DTSTART:18950201T000000
+RDATE:18950201T000000
 TZNAME:CST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T153000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+084320
 TZOFFSETTO:+0900
-TZNAME:CST
-DTSTART:18950201T000000
-RDATE:18950201T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18990501T000000
+RDATE:18990501T000000
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:18990501T000000
-RDATE:18990501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-TZNAME:CST
 DTSTART:19170101T000100
 RDATE:19170101T000100
 RDATE:19420101T020000
 RDATE:19420927T020000
 RDATE:19431003T020000
+TZNAME:CST
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-TZNAME:CST
 DTSTART:19170325T020000
 RDATE:19170325T020000
 RDATE:19420329T020000
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T153000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Perth.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Perth.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Perth.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,34 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Perth
 X-LIC-LOCATION:Australia/Perth
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
+DTSTART:18951201T000000
+RDATE:18951201T000000
 TZNAME:WST
-DTSTART:20070325T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20090328T180000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:WST
-DTSTART:20071028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20081025T180000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+074324
 TZOFFSETTO:+0800
-TZNAME:WST
-DTSTART:18951201T000000
-RDATE:18951201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:WST
 DTSTART:19170101T000100
 RDATE:19170101T000100
 RDATE:19420101T020000
@@ -37,11 +21,11 @@
 RDATE:19831030T020000
 RDATE:19911117T020000
 RDATE:20061203T020000
+TZNAME:WST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-TZNAME:WST
 DTSTART:19170325T020000
 RDATE:19170325T020000
 RDATE:19420329T020000
@@ -49,13 +33,30 @@
 RDATE:19750302T030000
 RDATE:19840304T030000
 RDATE:19920301T030000
+TZNAME:WST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430701T000000
+RDATE:19430701T000000
+TZNAME:WST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20070325T030000
+RRULE:FREQ=YEARLY;UNTIL=20090328T180000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:WST
-DTSTART:19430701T000000
-RDATE:19430701T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20071028T020000
+RRULE:FREQ=YEARLY;UNTIL=20081025T180000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:WST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Queensland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Queensland.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Queensland.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,63 +1,64 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Queensland
 X-LIC-LOCATION:Australia/Queensland
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
+DTSTART:18950101T000000
+RDATE:18950101T000000
 TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19891029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19911026T160000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19920229T160000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+101208
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950101T000000
-RDATE:18950101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-TZNAME:EST
 DTSTART:19170101T000100
 RDATE:19170101T000100
 RDATE:19420101T020000
 RDATE:19420927T020000
 RDATE:19431003T020000
 RDATE:19711031T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
 DTSTART:19170325T020000
 RDATE:19170325T020000
 RDATE:19420329T020000
 RDATE:19720227T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19710101T000000
 RDATE:19710101T000000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891029T020000
+RRULE:FREQ=YEARLY;UNTIL=19911026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19920229T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/South.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/South.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/South.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,112 +1,112 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/South
 X-LIC-LOCATION:Australia/South
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
+DTSTART:18950201T000000
+RDATE:18950201T000000
 TZNAME:CST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T153000Z
+TZOFFSETFROM:+091420
+TZOFFSETTO:+0900
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:18990501T000000
+RDATE:18990501T000000
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0930
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T163000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19910303T030000
+RDATE:19920322T030000
+RDATE:19930307T030000
+RDATE:19940320T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T153000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19710101T000000
+RDATE:19710101T000000
 TZNAME:CST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T163000Z
+TZOFFSETFROM:+0930
+TZOFFSETTO:+0930
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T163000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19950326T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T163000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+091420
-TZOFFSETTO:+0900
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T163000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:CST
-DTSTART:18950201T000000
-RDATE:18950201T000000
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CST
+TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:18990501T000000
-RDATE:18990501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19900318T030000
-RDATE:19910303T030000
-RDATE:19920322T030000
-RDATE:19930307T030000
-RDATE:19940320T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0930
-TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Sydney.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Sydney.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Sydney.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,123 +1,124 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Sydney
 X-LIC-LOCATION:Australia/Sydney
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+100452
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19830306T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T160000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:19710101T000000
+RDATE:19710101T000000
+TZNAME:EST
+TZOFFSETFROM:+1000
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T160000Z
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19890318T160000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19960331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19950304T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+100452
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Tasmania.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Tasmania.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Tasmania.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,146 +1,146 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Tasmania
 X-LIC-LOCATION:Australia/Tasmania
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950901T000000
+RDATE:18950901T000000
+TZNAME:EST
+TZOFFSETFROM:+094916
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19161001T020000
+RDATE:19161001T020000
 TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19170201T000000
+RDATE:19170201T000000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19680331T030000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420101T020000
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19671001T020000
+RDATE:19861019T020000
+RDATE:19871025T020000
+RDATE:20000827T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19681027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19670101T000000
+RDATE:19670101T000000
 TZNAME:EST
-DTSTART:19690309T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU;UNTIL=19710313T160000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19690309T030000
+RRULE:FREQ=YEARLY;UNTIL=19710313T160000Z;BYDAY=2SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19820328T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19830326T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19820328T030000
+RRULE:FREQ=YEARLY;UNTIL=19830326T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19840304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19860301T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840304T030000
+RRULE:FREQ=YEARLY;UNTIL=19860301T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19870315T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T160000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
+RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:EST
-DTSTART:19881030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901027T160000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19910331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20030329T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;UNTIL=19901027T160000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:19911006T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19991002T160000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20011007T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
+DTSTART:19910331T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20040328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:20080406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+094916
-TZOFFSETTO:+1000
+BEGIN:DAYLIGHT
+DTSTART:19911006T020000
+RRULE:FREQ=YEARLY;UNTIL=19991002T160000Z;BYDAY=1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:18950901T000000
-RDATE:18950901T000000
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19161001T020000
-RDATE:19161001T020000
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19671001T020000
-RDATE:19861019T020000
-RDATE:19871025T020000
-RDATE:20000827T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1100
+DTSTART:20011007T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170201T000000
-RDATE:19170201T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19680331T030000
-RDATE:19720227T030000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19670101T000000
-RDATE:19670101T000000
-RDATE:20060402T020000
-RDATE:20070325T020000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Victoria.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Victoria.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Victoria.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,121 +1,122 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Victoria
 X-LIC-LOCATION:Australia/Victoria
 BEGIN:STANDARD
-TZOFFSETFROM:+1100
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+093952
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:20000827T020000
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19710101T000000
+RDATE:19710101T000000
 TZNAME:EST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19900317T160000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:19861019T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU;UNTIL=19871017T160000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19881030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991030T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19910303T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19940305T160000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19950326T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T160000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19861019T020000
+RRULE:FREQ=YEARLY;UNTIL=19871017T160000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19881030T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EST
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T160000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910303T030000
+RRULE:FREQ=YEARLY;UNTIL=19940305T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T160000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+093952
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
 TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:+1000
 TZOFFSETTO:+1100
-TZNAME:EST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:20000827T020000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/West.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/West.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/West.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,34 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/West
 X-LIC-LOCATION:Australia/West
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
+DTSTART:18951201T000000
+RDATE:18951201T000000
 TZNAME:WST
-DTSTART:20070325T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20090328T180000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:WST
-DTSTART:20071028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20081025T180000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+074324
 TZOFFSETTO:+0800
-TZNAME:WST
-DTSTART:18951201T000000
-RDATE:18951201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:WST
 DTSTART:19170101T000100
 RDATE:19170101T000100
 RDATE:19420101T020000
@@ -37,11 +21,11 @@
 RDATE:19831030T020000
 RDATE:19911117T020000
 RDATE:20061203T020000
+TZNAME:WST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-TZNAME:WST
 DTSTART:19170325T020000
 RDATE:19170325T020000
 RDATE:19420329T020000
@@ -49,13 +33,30 @@
 RDATE:19750302T030000
 RDATE:19840304T030000
 RDATE:19920301T030000
+TZNAME:WST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430701T000000
+RDATE:19430701T000000
+TZNAME:WST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20070325T030000
+RRULE:FREQ=YEARLY;UNTIL=20090328T180000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:WST
-DTSTART:19430701T000000
-RDATE:19430701T000000
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20071028T020000
+RRULE:FREQ=YEARLY;UNTIL=20081025T180000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:WST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Yancowinna.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Yancowinna.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Yancowinna.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,136 +1,151 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Australia/Yancowinna
 X-LIC-LOCATION:Australia/Yancowinna
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+092548
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18960823T000000
+RDATE:18960823T000000
 TZNAME:CST
-DTSTART:19430328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19440325T153000Z
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:18990501T000000
+RDATE:18990501T000000
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0930
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19851026T163000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19810228T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19430328T020000
+RRULE:FREQ=YEARLY;UNTIL=19440325T153000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19830306T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19850302T163000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1030
+DTSTART:19710101T000000
+RDATE:19710101T000000
+TZNAME:CST
+TZOFFSETFROM:+0930
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19890318T163000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20071027T163000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19950304T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19960331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20050326T163000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19890318T163000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+092548
-TZOFFSETTO:+1000
-TZNAME:EST
-DTSTART:18950201T000000
-RDATE:18950201T000000
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19950304T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;UNTIL=19990327T163000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:CST
-DTSTART:18960823T000000
-RDATE:18960823T000000
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0930
+DTSTART:20000101T000000
+RDATE:20000101T000000
 TZNAME:CST
-DTSTART:18990501T000000
-RDATE:18990501T000000
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1030
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000326T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T163000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20001029T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0930
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CST
 TZOFFSETFROM:+1030
 TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0930
-TZOFFSETTO:+0930
-TZNAME:CST
-DTSTART:19710101T000000
-RDATE:19710101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1030
 TZOFFSETTO:+1030
-TZNAME:CST
-DTSTART:20000101T000000
-RDATE:20000101T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/Acre.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/Acre.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/Acre.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,74 +1,46 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Brazil/Acre
 X-LIC-LOCATION:Brazil/Acre
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:ACST
+TZOFFSETFROM:-043112
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+TZNAME:ACST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
 TZNAME:ACT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
 TZNAME:ACST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-043112
-TZOFFSETTO:-0500
-TZNAME:ACT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:ACST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:ACT
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -77,20 +49,44 @@
 RDATE:19860315T000000
 RDATE:19870214T000000
 RDATE:19880207T000000
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T040000Z;BYMONTH=4
+TZNAME:ACT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T040000Z;BYMONTH=3
 TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T050000Z;BYMONTH=11
+TZNAME:ACST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
+TZNAME:ACT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:AMT
 DTSTART:20080624T000000
 RDATE:20080624T000000
+TZNAME:AMT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/DeNoronha.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/DeNoronha.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/DeNoronha.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,69 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Brazil/DeNoronha
 X-LIC-LOCATION:Brazil/DeNoronha
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-TZNAME:FNT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
+DTSTART:19140101T000000
+RDATE:19140101T000000
 TZNAME:FNST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-TZNAME:FNT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-TZNAME:FNT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:FNST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:FNST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:FNST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:-020940
 TZOFFSETTO:-0200
-TZNAME:FNT
-DTSTART:19140101T000000
-RDATE:19140101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:FNST
 DTSTART:19311003T110000
 RDATE:19311003T110000
 RDATE:19321003T000000
@@ -71,14 +20,32 @@
 RDATE:19650131T000000
 RDATE:19651201T000000
 RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
 RDATE:19881016T000000
 RDATE:19891015T000000
 RDATE:19991003T000000
+RDATE:20001008T000000
+RDATE:20011014T000000
+TZNAME:FNST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T010000Z;BYMONTH=4
+TZNAME:FNT
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
-TZNAME:FNT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T020000Z;BYMONTH=12
+TZNAME:FNST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -92,16 +59,46 @@
 RDATE:20000227T000000
 RDATE:20001015T000000
 RDATE:20020217T000000
+TZNAME:FNT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T010000Z;BYMONTH=4
+TZNAME:FNT
+TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T010000Z;BYMONTH=3
 TZNAME:FNT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T020000Z;BYMONTH=11
+TZNAME:FNST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900917T000000
 RDATE:19900917T000000
+RDATE:20021001T000000
+TZNAME:FNT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990930T000000
 RDATE:19990930T000000
 RDATE:20010913T000000
-RDATE:20021001T000000
+TZNAME:FNST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0200
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/East.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/East.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/East.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,209 +1,175 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Brazil/East
 X-LIC-LOCATION:Brazil/East
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-030628
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+RDATE:19881016T000000
+RDATE:19891015T000000
+RDATE:19901021T000000
+RDATE:19911020T000000
+RDATE:19921025T000000
+RDATE:19961006T000000
+RDATE:19971006T000000
+RDATE:19981011T000000
+RDATE:19991003T000000
+RDATE:20021103T000000
+RDATE:20031019T000000
+RDATE:20041102T000000
+RDATE:20051016T000000
+RDATE:20061105T000000
+RDATE:20071014T000000
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T030000Z;BYMONTH=12
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19500416T010000
+RDATE:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:19910217T000000
+RDATE:19920209T000000
+RDATE:19930131T000000
+RDATE:19960211T000000
+RDATE:19970216T000000
+RDATE:19980301T000000
+RDATE:19990221T000000
+RDATE:20000227T000000
+RDATE:20070225T000000
+RDATE:20120226T000000
+RDATE:20150222T000000
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T020000Z;BYMONTH=4
 TZNAME:BRT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+BEGIN:STANDARD
+DTSTART:19631023T000000
+RDATE:19631023T000000
 TZNAME:BRST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
 TZNAME:BRST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T030000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19931017T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19951015T030000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T020000Z;BYMONTH=3
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19940220T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=19950219T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T030000Z;BYMONTH=11
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19961006T000000
-RRULE:FREQ=YEARLY;UNTIL=19971006T030000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;UNTIL=19951015T030000Z;BYDAY=-3SU;BYMONTH=10
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=20011014T030000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;UNTIL=19950219T020000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:BRT
-DTSTART:20010218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20060219T020000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20080217T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20110220T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;UNTIL=20011014T030000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;UNTIL=20060219T020000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:BRT
-DTSTART:20130217T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20140216T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20160221T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20220220T030000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;UNTIL=20110220T020000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:BRT
-DTSTART:20240218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20250216T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20270221T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20330220T030000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:20350218T000000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU;UNTIL=20360217T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-030628
-TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
+TZNAME:BRST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631023T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-RDATE:19881016T000000
-RDATE:19891015T000000
-RDATE:19901021T000000
-RDATE:19911020T000000
-RDATE:19921025T000000
-RDATE:19981011T000000
-RDATE:19991003T000000
-RDATE:20021103T000000
-RDATE:20031019T000000
-RDATE:20041102T000000
-RDATE:20051016T000000
-RDATE:20061105T000000
-RDATE:20071014T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;UNTIL=20140216T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
-TZNAME:BRT
-DTSTART:19500416T010000
-RDATE:19500416T010000
-RDATE:19530301T000000
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:19890129T000000
-RDATE:19900211T000000
-RDATE:19910217T000000
-RDATE:19920209T000000
-RDATE:19930131T000000
-RDATE:19960211T000000
-RDATE:19970216T000000
-RDATE:19980301T000000
-RDATE:19990221T000000
-RDATE:20000227T000000
-RDATE:20070225T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0200
-TZNAME:BRST
-DTSTART:19640101T000000
-RDATE:19640101T000000
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;UNTIL=20170219T020000Z;BYDAY=3SU;BYMONTH=2
 TZNAME:BRT
-DTSTART:20120226T000000
-RDATE:20120226T000000
-RDATE:20150222T000000
-RDATE:20230226T000000
-RDATE:20260222T000000
-RDATE:20340226T000000
-RDATE:20370222T000000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/West.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/West.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/West.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,75 +1,47 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Brazil/West
 X-LIC-LOCATION:Brazil/West
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-040004
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+RDATE:19650131T000000
+RDATE:19651201T000000
+RDATE:19851102T000000
+RDATE:19861025T000000
+RDATE:19871025T000000
+RDATE:19931017T000000
+TZNAME:AMST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
 TZNAME:AMT
-DTSTART:19510401T000000
-RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19660301T000000
-RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T040000Z;BYMONTH=12
 TZNAME:AMST
-DTSTART:19661101T000000
-RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19861025T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-040004
-TZOFFSETTO:-0400
-TZNAME:AMT
-DTSTART:19140101T000000
-RDATE:19140101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:AMST
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-RDATE:19650131T000000
-RDATE:19651201T000000
-RDATE:19851102T000000
-RDATE:19931017T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AMT
 DTSTART:19500416T010000
 RDATE:19500416T010000
 RDATE:19530301T000000
@@ -79,15 +51,45 @@
 RDATE:19870214T000000
 RDATE:19880207T000000
 RDATE:19940220T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:19510401T000000
+RRULE:FREQ=YEARLY;UNTIL=19520401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660301T000000
+RRULE:FREQ=YEARLY;UNTIL=19680301T030000Z;BYMONTH=3
 TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661101T000000
+RRULE:FREQ=YEARLY;UNTIL=19671101T040000Z;BYMONTH=11
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19880912T000000
 RDATE:19880912T000000
-RDATE:19930928T000000
 RDATE:19940922T000000
+TZNAME:AMT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19930928T000000
+RDATE:19930928T000000
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/CET.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/CET.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/CET.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,87 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:CET
+X-LIC-LOCATION:CET
+BEGIN:STANDARD
+DTSTART:18000101T010000
+RDATE:18000101T010000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+RDATE:19770925T030000
+RDATE:19781001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;UNTIL=19450402T010000Z;BYDAY=1MO;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/CST6CDT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/CST6CDT.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/CST6CDT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,101 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:CST6CDT
+X-LIC-LOCATION:CST6CDT
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Atlantic.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Atlantic.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Atlantic.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,211 +1,221 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Canada/Atlantic
 X-LIC-LOCATION:Canada/Atlantic
 BEGIN:STANDARD
+DTSTART:19020615T000000
+RDATE:19020615T000000
+TZNAME:AST
+TZOFFSETFROM:-041424
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160401T000000
+RDATE:19160401T000000
+RDATE:19180414T020000
+RDATE:19200509T000000
+RDATE:19210506T000000
+RDATE:19220430T000000
+RDATE:19260516T000000
+RDATE:19270501T000000
+RDATE:19320501T000000
+RDATE:19330430T000000
+RDATE:19340520T000000
+RDATE:19350602T000000
+RDATE:19360601T000000
+RDATE:19390528T000000
+TZNAME:ADT
 TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T000000
+RDATE:19161001T000000
+RDATE:19181031T020000
+RDATE:19200829T000000
+RDATE:19230904T000000
+RDATE:19240915T000000
+RDATE:19250928T000000
+RDATE:19260913T000000
+RDATE:19270926T000000
+RDATE:19280909T000000
+RDATE:19290903T000000
+RDATE:19300915T000000
+RDATE:19331002T000000
+RDATE:19340916T000000
+RDATE:19350930T000000
+RDATE:19360914T000000
+RDATE:19450930T020000
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+RDATE:19190101T000000
+RDATE:19460101T000000
+RDATE:19740101T000000
 TZNAME:AST
-DTSTART:19180101T000000
-RRULE:FREQ=YEARLY;UNTIL=19190101T040000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19210905T000000
+RRULE:FREQ=YEARLY;UNTIL=19220905T030000Z;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19210905T000000
-RRULE:FREQ=YEARLY;UNTIL=19220905T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19230506T000000
+RRULE:FREQ=YEARLY;UNTIL=19250503T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19230506T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19250503T040000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19280513T000000
+RRULE:FREQ=YEARLY;UNTIL=19310510T040000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19280513T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19310510T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19310928T000000
+RRULE:FREQ=YEARLY;UNTIL=19320926T030000Z;BYDAY=-1MO;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19310928T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1MO;UNTIL=19320926T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19370502T000000
+RRULE:FREQ=YEARLY;UNTIL=19380501T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19370502T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19380501T040000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19370927T000000
+RRULE:FREQ=YEARLY;UNTIL=19410929T030000Z;BYDAY=-1MO;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19370927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1MO;UNTIL=19410929T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19400505T000000
+RRULE:FREQ=YEARLY;UNTIL=19410504T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19400505T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19410504T040000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T060000Z
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19490925T050000Z
-END:STANDARD
+TZOFFSETTO:-0300
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19490424T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19490925T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19560429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19590426T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19560930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;UNTIL=19590426T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19620429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T060000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19560930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
+DTSTART:19620429T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T060000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:ADT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T060000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-041424
-TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19020615T000000
-RDATE:19020615T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19160401T000000
-RDATE:19160401T000000
-RDATE:19180414T020000
-RDATE:19200509T000000
-RDATE:19210506T000000
-RDATE:19220430T000000
-RDATE:19260516T000000
-RDATE:19270501T000000
-RDATE:19320501T000000
-RDATE:19330430T000000
-RDATE:19340520T000000
-RDATE:19350602T000000
-RDATE:19360601T000000
-RDATE:19390528T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19161001T000000
-RDATE:19161001T000000
-RDATE:19181031T020000
-RDATE:19200829T000000
-RDATE:19230904T000000
-RDATE:19240915T000000
-RDATE:19250928T000000
-RDATE:19260913T000000
-RDATE:19270926T000000
-RDATE:19280909T000000
-RDATE:19290903T000000
-RDATE:19300915T000000
-RDATE:19331002T000000
-RDATE:19340916T000000
-RDATE:19350930T000000
-RDATE:19360914T000000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T060000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:AWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
-TZNAME:APT
-DTSTART:19450814T200000
-RDATE:19450814T200000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
-TZNAME:AST
-DTSTART:19460101T000000
-RDATE:19460101T000000
-RDATE:19740101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Central.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Central.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Central.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,128 +1,129 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Canada/Central
 X-LIC-LOCATION:Canada/Central
+BEGIN:STANDARD
+DTSTART:18870716T000000
+RDATE:18870716T000000
+TZNAME:CST
+TZOFFSETFROM:-062836
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160423T000000
+RDATE:19160423T000000
+RDATE:19180414T020000
+RDATE:19370516T020000
+RDATE:19460512T020000
+RDATE:19500501T020000
+RDATE:19630428T020000
+RDATE:20060402T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19160917T000000
+RDATE:19160917T000000
+RDATE:19181031T020000
+RDATE:19370926T020000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19500930T020000
+RDATE:19591025T020000
+RDATE:19600925T020000
+RDATE:19630922T020000
+RDATE:20061029T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19490925T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19490424T080000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T080000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;UNTIL=19490925T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19600424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19660424T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19661030T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20051030T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
+DTSTART:19660424T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20050403T080000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19661030T030000
+RRULE:FREQ=YEARLY;UNTIL=20051030T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-062836
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18870716T000000
-RDATE:18870716T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20050403T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19160423T000000
-RDATE:19160423T000000
-RDATE:19180414T020000
-RDATE:19370516T020000
-RDATE:19460512T020000
-RDATE:19500501T020000
-RDATE:19630428T020000
-RDATE:20060402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:20060101T000000
+RDATE:20060101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19160917T000000
-RDATE:19160917T000000
-RDATE:19181031T020000
-RDATE:19370926T020000
-RDATE:19450930T020000
-RDATE:19461013T020000
-RDATE:19500930T020000
-RDATE:19591025T020000
-RDATE:19600925T020000
-RDATE:19630922T020000
-RDATE:20061029T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20060101T000000
-RDATE:20060101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/East-Saskatchewan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/East-Saskatchewan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/East-Saskatchewan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,99 +1,100 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Canada/East-Saskatchewan
 X-LIC-LOCATION:Canada/East-Saskatchewan
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19300504T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19340506T070000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+DTSTART:19050901T000000
+RDATE:19050901T000000
+TZNAME:MST
+TZOFFSETFROM:-065836
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19301005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19341007T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19460414T020000
+RDATE:19590426T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19370411T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=2SU;UNTIL=19410413T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19371010T000000
+RDATE:19381002T000000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19591025T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19391008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19411012T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19300504T000000
+RRULE:FREQ=YEARLY;UNTIL=19340506T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19570428T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19301005T000000
+RRULE:FREQ=YEARLY;UNTIL=19341007T060000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19570929T080000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-065836
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19050901T000000
-RDATE:19050901T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19370411T000000
+RRULE:FREQ=YEARLY;UNTIL=19410413T070000Z;BYDAY=2SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19460414T020000
-RDATE:19590426T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19391008T000000
+RRULE:FREQ=YEARLY;UNTIL=19411012T060000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19371010T000000
-RDATE:19381002T000000
-RDATE:19450930T020000
-RDATE:19461013T020000
-RDATE:19591025T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19570428T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:CST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;UNTIL=19570929T080000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19600424T020000
 RDATE:19600424T020000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Eastern.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Eastern.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Eastern.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,170 +1,185 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Canada/Eastern
 X-LIC-LOCATION:Canada/Eastern
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:EST
+TZOFFSETFROM:-051732
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19190330T233000
+RDATE:19200502T020000
+RDATE:19210515T020000
+RDATE:19320501T020000
+RDATE:19460428T020000
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19220514T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19230513T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19191026T000000
+RDATE:19200926T000000
+RDATE:19210915T020000
+RDATE:19331001T020000
+RDATE:19450930T020000
+RDATE:19460929T020000
+RDATE:19491127T000000
+RDATE:19501126T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19190101T000000
+RDATE:19190101T000000
+RDATE:19460101T000000
+RDATE:19740101T000000
 TZNAME:EST
-DTSTART:19220917T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19260919T060000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19220514T020000
+RRULE:FREQ=YEARLY;UNTIL=19230513T070000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19240504T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19270501T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19220917T020000
+RRULE:FREQ=YEARLY;UNTIL=19260919T060000Z;BYDAY=3SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19270925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19320925T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19240504T020000
+RRULE:FREQ=YEARLY;UNTIL=19270501T070000Z;BYDAY=1SU;BYMONTH=5
 TZNAME:EDT
-DTSTART:19280429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19310426T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19330430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19400428T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19270925T020000
+RRULE:FREQ=YEARLY;UNTIL=19320925T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19340930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19390924T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280429T020000
+RRULE:FREQ=YEARLY;UNTIL=19310426T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19330430T020000
+RRULE:FREQ=YEARLY;UNTIL=19400428T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:19470427T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19490424T050000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19340930T020000
+RRULE:FREQ=YEARLY;UNTIL=19390924T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19470928T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19480926T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T030000
+RDATE:19420209T030000
+TZNAME:EWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470427T000000
+RRULE:FREQ=YEARLY;UNTIL=19490424T050000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19500430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:19470928T000000
+RRULE:FREQ=YEARLY;UNTIL=19480926T040000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:EST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19560930T060000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19571027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
+DTSTART:19500430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19560930T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-051732
+DTSTART:19571027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:18950101T000000
-RDATE:18950101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19190330T233000
-RDATE:19200502T020000
-RDATE:19210515T020000
-RDATE:19320501T020000
-RDATE:19460428T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19191026T000000
-RDATE:19200926T000000
-RDATE:19210915T020000
-RDATE:19331001T020000
-RDATE:19450930T020000
-RDATE:19460929T020000
-RDATE:19491127T000000
-RDATE:19501126T020000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19190101T000000
-RDATE:19190101T000000
-RDATE:19460101T000000
-RDATE:19740101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Mountain.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Mountain.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Mountain.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,114 +1,122 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Canada/Mountain
 X-LIC-LOCATION:Canada/Mountain
+BEGIN:STANDARD
+DTSTART:19060901T000000
+RDATE:19060901T000000
+TZNAME:MST
+TZOFFSETFROM:-073352
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
+DTSTART:19180414T020000
+RRULE:FREQ=YEARLY;UNTIL=19190413T090000Z;BYDAY=2SU;BYMONTH=4
 TZNAME:MDT
-DTSTART:19180414T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=2SU;UNTIL=19190413T090000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19200425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19230429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19190527T020000
+RDATE:19201031T020000
+RDATE:19450930T020000
+RDATE:19470928T020000
+RDATE:19671029T020000
+RDATE:19691026T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19230930T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200425T020000
+RRULE:FREQ=YEARLY;UNTIL=19230429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19720430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;UNTIL=19230930T080000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19721029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RDATE:19470427T020000
+RDATE:19670430T020000
+RDATE:19690427T020000
 TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19720430T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-073352
-TZOFFSETTO:-0700
+DTSTART:19870101T000000
+RDATE:19870101T000000
 TZNAME:MST
-DTSTART:19060901T000000
-RDATE:19060901T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19190527T020000
-RDATE:19201031T020000
-RDATE:19450930T020000
-RDATE:19470928T020000
-RDATE:19671029T020000
-RDATE:19691026T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
-END:DAYLIGHT
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19470427T020000
-RDATE:19470427T020000
-RDATE:19670430T020000
-RDATE:19690427T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19870101T000000
-RDATE:19870101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Newfoundland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Newfoundland.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Newfoundland.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,190 +1,189 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Canada/Newfoundland
 X-LIC-LOCATION:Canada/Newfoundland
 BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+RDATE:19180101T000000
+RDATE:19190101T000000
+TZNAME:NST
 TZOFFSETFROM:-033052
 TZOFFSETTO:-033052
-TZNAME:NST
-DTSTART:19180101T000000
-RRULE:FREQ=YEARLY;UNTIL=19190101T033052Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170408T020000
+RDATE:19170408T020000
+RDATE:19180414T020000
+RDATE:19190505T230000
+TZNAME:NDT
 TZOFFSETFROM:-033052
 TZOFFSETTO:-023052
-TZNAME:NDT
-DTSTART:19200502T230000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19340507T023052Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170917T020000
+RDATE:19170917T020000
+RDATE:19181031T020000
+RDATE:19190812T230000
+TZNAME:NST
 TZOFFSETFROM:-023052
 TZOFFSETTO:-033052
-TZNAME:NST
-DTSTART:19201031T230000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19341029T013052Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
+DTSTART:19200502T230000
+RRULE:FREQ=YEARLY;UNTIL=19340507T023052Z;BYDAY=1SU;BYMONTH=5
 TZNAME:NDT
-DTSTART:19360511T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=MO;UNTIL=19410512T033000Z
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
+DTSTART:19201031T230000
+RRULE:FREQ=YEARLY;UNTIL=19341029T013052Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NST
-DTSTART:19361005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19411006T023000Z
+TZOFFSETFROM:-023052
+TZOFFSETTO:-033052
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19350330T000000
+RDATE:19350330T000000
+TZNAME:NST
+TZOFFSETFROM:-033052
+TZOFFSETTO:-0330
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19350505T230000
+RDATE:19350505T230000
+RDATE:19870405T000100
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19460512T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19500514T053000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19351027T230000
+RDATE:19351027T230000
+RDATE:19450930T020000
+RDATE:19871025T000100
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19461006T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19501008T043000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19360511T000000
+RRULE:FREQ=YEARLY;UNTIL=19410512T033000Z;BYDAY=MO;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=5
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T053000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19361005T000000
+RRULE:FREQ=YEARLY;UNTIL=19411006T023000Z;BYDAY=MO;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19590927T043000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
+DTSTART:19420511T000000
+RDATE:19420511T000000
 TZNAME:NST
-DTSTART:19601030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19861026T043000Z
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0330
+DTSTART:19450814T203000
+RDATE:19450814T203000
+TZNAME:NPT
+TZOFFSETFROM:-0230
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19890402T000100
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T033100Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
+DTSTART:19460101T000000
+RDATE:19460101T000000
 TZNAME:NST
-DTSTART:19891029T000100
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T023100Z
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19460512T020000
+RRULE:FREQ=YEARLY;UNTIL=19500514T053000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:20070311T000100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19461006T020000
+RRULE:FREQ=YEARLY;UNTIL=19501008T043000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:NST
 TZOFFSETFROM:-0230
 TZOFFSETTO:-0330
-TZNAME:NST
-DTSTART:20071104T000100
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-033052
-TZOFFSETTO:-033052
-TZNAME:NST
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-033052
-TZOFFSETTO:-023052
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T053000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:NDT
-DTSTART:19170408T020000
-RDATE:19170408T020000
-RDATE:19180414T020000
-RDATE:19190505T230000
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-023052
-TZOFFSETTO:-033052
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T043000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:NST
-DTSTART:19170917T020000
-RDATE:19170917T020000
-RDATE:19181031T020000
-RDATE:19190812T230000
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-033052
-TZOFFSETTO:-0330
+DTSTART:19601030T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T043000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NST
-DTSTART:19350330T000000
-RDATE:19350330T000000
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19880403T000100
+RDATE:19880403T000100
+TZNAME:NDDT
 TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-TZNAME:NDT
-DTSTART:19350505T230000
-RDATE:19350505T230000
-RDATE:19870405T000100
+TZOFFSETTO:-0130
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
+DTSTART:19881030T000100
+RDATE:19881030T000100
 TZNAME:NST
-DTSTART:19351027T230000
-RDATE:19351027T230000
-RDATE:19450930T020000
-RDATE:19871025T000100
+TZOFFSETFROM:-0130
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19890402T000100
+RRULE:FREQ=YEARLY;UNTIL=20060402T033100Z;BYDAY=1SU;BYMONTH=4
+TZNAME:NDT
 TZOFFSETFROM:-0330
 TZOFFSETTO:-0230
-TZNAME:NWT
-DTSTART:19420511T000000
-RDATE:19420511T000000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0230
-TZNAME:NPT
-DTSTART:19450814T203000
-RDATE:19450814T203000
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0330
+DTSTART:19891029T000100
+RRULE:FREQ=YEARLY;UNTIL=20061029T023100Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NST
-DTSTART:19460101T000000
-RDATE:19460101T000000
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:NDT
 TZOFFSETFROM:-0330
-TZOFFSETTO:-0130
-TZNAME:NDDT
-DTSTART:19880403T000100
-RDATE:19880403T000100
+TZOFFSETTO:-0230
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0130
-TZOFFSETTO:-0330
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:NST
-DTSTART:19881030T000100
-RDATE:19881030T000100
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Pacific.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Pacific.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Pacific.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,94 +1,102 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Canada/Pacific
 X-LIC-LOCATION:Canada/Pacific
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:PST
+TZOFFSETFROM:-081228
+TZOFFSETTO:-0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+RDATE:19461013T020000
 TZNAME:PST
-DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T090000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:PWT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;UNTIL=19610924T090000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T090000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:PST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-081228
+DTSTART:19870101T000000
+RDATE:19870101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
-RDATE:19461013T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
 TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:PPT
-DTSTART:19450814T160000
-RDATE:19450814T160000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19870101T000000
-RDATE:19870101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Saskatchewan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Saskatchewan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Saskatchewan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,99 +1,100 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Canada/Saskatchewan
 X-LIC-LOCATION:Canada/Saskatchewan
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19300504T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19340506T070000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+DTSTART:19050901T000000
+RDATE:19050901T000000
+TZNAME:MST
+TZOFFSETFROM:-065836
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19301005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19341007T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19460414T020000
+RDATE:19590426T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19370411T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=2SU;UNTIL=19410413T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19371010T000000
+RDATE:19381002T000000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19591025T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19391008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19411012T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19300504T000000
+RRULE:FREQ=YEARLY;UNTIL=19340506T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19570428T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19301005T000000
+RRULE:FREQ=YEARLY;UNTIL=19341007T060000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19570929T080000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-065836
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19050901T000000
-RDATE:19050901T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19370411T000000
+RRULE:FREQ=YEARLY;UNTIL=19410413T070000Z;BYDAY=2SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19460414T020000
-RDATE:19590426T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19391008T000000
+RRULE:FREQ=YEARLY;UNTIL=19411012T060000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19371010T000000
-RDATE:19381002T000000
-RDATE:19450930T020000
-RDATE:19461013T020000
-RDATE:19591025T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19570428T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:CST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470928T020000
+RRULE:FREQ=YEARLY;UNTIL=19570929T080000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19600424T020000
 RDATE:19600424T020000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Yukon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Yukon.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Yukon.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,108 +1,110 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Canada/Yukon
 X-LIC-LOCATION:Canada/Yukon
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19000820T000000
+RDATE:19000820T000000
+TZNAME:YST
 TZOFFSETFROM:-090012
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19000820T000000
-RDATE:19000820T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:YDT
 DTSTART:19180414T020000
 RDATE:19180414T020000
 RDATE:19190525T020000
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:YST
 DTSTART:19181027T020000
 RDATE:19181027T020000
 RDATE:19191101T000000
 RDATE:19450930T020000
+TZNAME:YST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:YWT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-TZNAME:YWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T150000
+RDATE:19450814T150000
+TZNAME:YPT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:YPT
-DTSTART:19450814T150000
-RDATE:19450814T150000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:YDDT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0700
-TZNAME:YDDT
-DTSTART:19650425T000000
-RDATE:19650425T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:YST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19651031T020000
-RDATE:19651031T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19660701T020000
+RDATE:19660701T020000
+TZNAME:PST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0800
-DTSTART:19660701T020000
-RDATE:19660701T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:PST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:PST
-DTSTART:19800101T000000
-RDATE:19800101T000000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/Continental.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/Continental.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/Continental.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,168 +1,103 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Chile/Continental
 X-LIC-LOCATION:Chile/Continental
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:CLT
-DTSTART:19280401T000000
-RRULE:FREQ=YEARLY;UNTIL=19320401T040000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:CLST
-DTSTART:19280901T000000
-RRULE:FREQ=YEARLY;UNTIL=19320901T050000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19701011T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19721015T040000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19720312T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19860309T030000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19741013T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19871011T040000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19880313T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19890312T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19910310T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19960310T030000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19911013T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19971012T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
-DTSTART:19991010T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:20000312T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=20070311T030000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:20090315T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:SMT
 TZOFFSETFROM:-044246
 TZOFFSETTO:-044246
-TZNAME:SMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19100101T000000
+RDATE:19100101T000000
+TZNAME:CLT
 TZOFFSETFROM:-044246
 TZOFFSETTO:-0500
-TZNAME:CLT
-DTSTART:19100101T000000
-RDATE:19100101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19160701T000000
+RDATE:19160701T000000
+TZNAME:SMT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-044246
-TZNAME:SMT
-DTSTART:19160701T000000
-RDATE:19160701T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19180901T000000
+RDATE:19180901T000000
+TZNAME:CLT
 TZOFFSETFROM:-044246
 TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19180901T000000
-RDATE:19180901T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19190701T000000
+RDATE:19190701T000000
+TZNAME:SMT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-044246
-TZNAME:SMT
-DTSTART:19190701T000000
-RDATE:19190701T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19270901T000000
+RDATE:19270901T000000
+TZNAME:CLST
 TZOFFSETFROM:-044246
 TZOFFSETTO:-0400
-TZNAME:CLST
-DTSTART:19270901T000000
-RDATE:19270901T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19280401T000000
+RRULE:FREQ=YEARLY;UNTIL=19320401T040000Z;BYMONTH=4
+TZNAME:CLT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CLT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19280901T000000
+RRULE:FREQ=YEARLY;UNTIL=19320901T050000Z;BYMONTH=9
+TZNAME:CLST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19420601T000000
 RDATE:19420601T000000
 RDATE:19460831T230000
+TZNAME:CLT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420801T000000
+RDATE:19420801T000000
+TZNAME:CLST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CLST
-DTSTART:19420801T000000
-RDATE:19420801T000000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460715T000000
+RDATE:19460715T000000
+TZNAME:CLST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:CLST
-DTSTART:19460715T000000
-RDATE:19460715T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19470331T230000
+RDATE:19470331T230000
+TZNAME:CLT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CLT
-DTSTART:19470331T230000
-RDATE:19470331T230000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19470522T000000
+RDATE:19470522T000000
+TZNAME:CLST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CLT
-DTSTART:19470522T000000
-RDATE:19470522T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:CLST
 DTSTART:19681103T000000
 RDATE:19681103T000000
 RDATE:19691123T000000
@@ -171,11 +106,11 @@
 RDATE:19891015T000000
 RDATE:19900916T000000
 RDATE:19980927T000000
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-TZNAME:CLT
 DTSTART:19690330T000000
 RDATE:19690330T000000
 RDATE:19700329T000000
@@ -186,6 +121,81 @@
 RDATE:19980315T000000
 RDATE:19990404T000000
 RDATE:20080330T000000
+RDATE:20090315T000000
+RDATE:20100404T000000
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19701011T000000
+RRULE:FREQ=YEARLY;UNTIL=19721015T040000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19720312T000000
+RRULE:FREQ=YEARLY;UNTIL=19860309T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19741013T000000
+RRULE:FREQ=YEARLY;UNTIL=19871011T040000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19880313T000000
+RRULE:FREQ=YEARLY;UNTIL=19890312T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910310T000000
+RRULE:FREQ=YEARLY;UNTIL=19960310T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19911013T000000
+RRULE:FREQ=YEARLY;UNTIL=19971012T040000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19991010T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20000312T000000
+RRULE:FREQ=YEARLY;UNTIL=20070311T030000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110313T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/EasterIsland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/EasterIsland.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/EasterIsland.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,163 +1,166 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Chile/EasterIsland
 X-LIC-LOCATION:Chile/EasterIsland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:EMT
+TZOFFSETFROM:-071744
+TZOFFSETTO:-071728
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320901T000000
+RDATE:19320901T000000
+TZNAME:EASST
+TZOFFSETFROM:-071728
 TZOFFSETTO:-0600
-TZNAME:EASST
-DTSTART:19701010T210000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19721015T040000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420531T220000
+RDATE:19420531T220000
+RDATE:19460831T210000
+RDATE:19690329T210000
+RDATE:19700328T210000
+RDATE:19710313T210000
+TZNAME:EAST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:EAST
-DTSTART:19720311T210000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19810315T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420731T220000
+RDATE:19420731T220000
+RDATE:19681102T210000
+RDATE:19691122T210000
+RDATE:19730929T210000
+TZNAME:EASST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:EASST
-DTSTART:19741012T210000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19811011T040000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460714T220000
+RDATE:19460714T220000
+TZNAME:EASST
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EASST
-DTSTART:19821009T220000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19871011T040000Z
+TZOFFSETTO:-0600
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19470331T210000
+RDATE:19470331T210000
 TZNAME:EAST
-DTSTART:19830312T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19860309T030000Z
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19701010T210000
+RRULE:FREQ=YEARLY;UNTIL=19721015T040000Z;BYDAY=2SA;BYMONTH=10
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19720311T210000
+RRULE:FREQ=YEARLY;UNTIL=19810315T030000Z;BYDAY=2SA;BYMONTH=3
 TZNAME:EAST
-DTSTART:19880312T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19890312T030000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19741012T210000
+RRULE:FREQ=YEARLY;UNTIL=19811011T040000Z;BYDAY=2SA;BYMONTH=10
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19820313T210000
+RDATE:19820313T210000
+TZNAME:EAST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:EAST
-DTSTART:19910309T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19960310T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
+DTSTART:19821009T220000
+RRULE:FREQ=YEARLY;UNTIL=19871011T040000Z;BYDAY=2SA;BYMONTH=10
 TZNAME:EASST
-DTSTART:19911012T220000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19971012T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EASST
-DTSTART:19991009T220000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830312T220000
+RRULE:FREQ=YEARLY;UNTIL=19860309T030000Z;BYDAY=2SA;BYMONTH=3
+TZNAME:EAST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:EAST
-DTSTART:20000311T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=20070311T030000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19870411T220000
+RDATE:19870411T220000
+RDATE:19900317T220000
+RDATE:19970329T220000
+RDATE:19980314T220000
+RDATE:19990403T220000
+RDATE:20080329T220000
+RDATE:20090314T220000
+RDATE:20100403T220000
+TZNAME:EAST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:EAST
-DTSTART:20090314T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-071744
-TZOFFSETTO:-071728
-TZNAME:EMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
+DTSTART:19880312T220000
+RRULE:FREQ=YEARLY;UNTIL=19890312T030000Z;BYDAY=2SA;BYMONTH=3
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-071728
-TZOFFSETTO:-0600
+DTSTART:19881001T220000
+RDATE:19881001T220000
+RDATE:19891014T220000
+RDATE:19900915T220000
+RDATE:19980926T220000
 TZNAME:EASST
-DTSTART:19320901T000000
-RDATE:19320901T000000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
+DTSTART:19910309T220000
+RRULE:FREQ=YEARLY;UNTIL=19960310T030000Z;BYDAY=2SA;BYMONTH=3
 TZNAME:EAST
-DTSTART:19420531T220000
-RDATE:19420531T220000
-RDATE:19460831T210000
-RDATE:19690329T210000
-RDATE:19700328T210000
-RDATE:19710313T210000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
+DTSTART:19911012T220000
+RRULE:FREQ=YEARLY;UNTIL=19971012T040000Z;BYDAY=2SA;BYMONTH=10
 TZNAME:EASST
-DTSTART:19420731T220000
-RDATE:19420731T220000
-RDATE:19681102T210000
-RDATE:19691122T210000
-RDATE:19730929T210000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19991009T220000
+RRULE:FREQ=YEARLY;BYDAY=2SA;BYMONTH=10
+TZNAME:EASST
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:EASST
-DTSTART:19460714T220000
-RDATE:19460714T220000
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
+DTSTART:20000311T220000
+RRULE:FREQ=YEARLY;UNTIL=20070311T030000Z;BYDAY=2SA;BYMONTH=3
 TZNAME:EAST
-DTSTART:19470331T210000
-RDATE:19470331T210000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
+DTSTART:20110312T220000
+RRULE:FREQ=YEARLY;BYDAY=2SA;BYMONTH=3
 TZNAME:EAST
-DTSTART:19820313T210000
-RDATE:19820313T210000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:EAST
-DTSTART:19870411T220000
-RDATE:19870411T220000
-RDATE:19900317T220000
-RDATE:19970329T220000
-RDATE:19980314T220000
-RDATE:19990403T220000
-RDATE:20080329T220000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EASST
-DTSTART:19881001T220000
-RDATE:19881001T220000
-RDATE:19891014T220000
-RDATE:19900915T220000
-RDATE:19980926T220000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Cuba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Cuba.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Cuba.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,193 +1,190 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Cuba
 X-LIC-LOCATION:Cuba
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:HMT
+TZOFFSETFROM:-052928
+TZOFFSETTO:-052936
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19250719T120000
+RDATE:19250719T120000
+TZNAME:CST
+TZOFFSETFROM:-052936
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280610T000000
+RDATE:19280610T000000
+RDATE:19650601T000000
+RDATE:19660529T000000
+RDATE:19670408T000000
+RDATE:19680414T000000
+RDATE:19780507T000000
+RDATE:20070311T000000
+RDATE:20080316T000000
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19400602T000000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19420607T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19281010T000000
+RDATE:19281010T000000
+RDATE:19650930T000000
+RDATE:19661002T000000
+RDATE:19961006T010000
+RDATE:19971012T010000
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19400901T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=19420906T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19400602T000000
+RRULE:FREQ=YEARLY;UNTIL=19420607T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19450603T000000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19460602T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19400901T000000
+RRULE:FREQ=YEARLY;UNTIL=19420906T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19450902T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU;UNTIL=19460901T040000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19450603T000000
+RRULE:FREQ=YEARLY;UNTIL=19460602T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450902T000000
+RRULE:FREQ=YEARLY;UNTIL=19460901T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19670910T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=2SU;UNTIL=19680908T040000Z
+RRULE:FREQ=YEARLY;UNTIL=19680908T040000Z;BYDAY=2SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T000000
+RRULE:FREQ=YEARLY;UNTIL=19770424T050000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19690427T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19770424T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19691026T000000
+RRULE:FREQ=YEARLY;UNTIL=19711031T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19691026T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19711031T040000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19721008T000000
+RRULE:FREQ=YEARLY;UNTIL=19741008T040000Z;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19721008T000000
-RRULE:FREQ=YEARLY;UNTIL=19741008T040000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19751026T000000
+RRULE:FREQ=YEARLY;UNTIL=19771030T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19751026T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19771030T040000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19781008T000000
+RRULE:FREQ=YEARLY;UNTIL=19901014T040000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19781008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19901014T040000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790318T000000
+RRULE:FREQ=YEARLY;UNTIL=19800316T050000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19790318T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19800316T050000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19810510T000000
+RRULE:FREQ=YEARLY;UNTIL=19850505T050000Z;BYDAY=SU;BYMONTHDAY=5,6,7,8,9,10,
+ 11;BYMONTH=5
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19810510T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=5,6,7,8,9,10,11;BYDAY=SU;UNTIL=19850505T050000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19860316T000000
+RRULE:FREQ=YEARLY;UNTIL=19890319T050000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19860316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19890319T050000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19900401T000000
+RRULE:FREQ=YEARLY;UNTIL=19970406T050000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19900401T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19970406T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19911013T010000
+RRULE:FREQ=YEARLY;UNTIL=19951008T050000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19911013T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19951008T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19980329T000000
+RRULE:FREQ=YEARLY;UNTIL=19990328T050000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19980329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19990328T050000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19981025T010000
+RRULE:FREQ=YEARLY;UNTIL=20031026T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19981025T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20031026T050000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:CDT
 DTSTART:20000402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20040404T050000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
+RRULE:FREQ=YEARLY;UNTIL=20040404T050000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:CDT
-DTSTART:20050403T010000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T050000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:20061029T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:20080316T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-052928
-TZOFFSETTO:-052936
-TZNAME:HMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-052936
-TZOFFSETTO:-0500
+DTSTART:20061029T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19250719T120000
-RDATE:19250719T120000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20090308T000000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:CDT
-DTSTART:19280610T000000
-RDATE:19280610T000000
-RDATE:19650601T000000
-RDATE:19660529T000000
-RDATE:19670408T000000
-RDATE:19680414T000000
-RDATE:19780507T000000
-RDATE:20070311T000000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:CST
-DTSTART:19281010T000000
-RDATE:19281010T000000
-RDATE:19650930T000000
-RDATE:19661002T000000
-RDATE:19961006T010000
-RDATE:19971012T010000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/EET.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/EET.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/EET.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,52 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:EET
+X-LIC-LOCATION:EET
+BEGIN:STANDARD
+DTSTART:18000101T020000
+RDATE:18000101T020000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T030000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19770925T040000
+RDATE:19770925T040000
+RDATE:19781001T040000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790930T040000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/EST.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/EST.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/EST.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:EST
+X-LIC-LOCATION:EST
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/EST5EDT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/EST5EDT.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/EST5EDT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,101 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:EST5EDT
+X-LIC-LOCATION:EST5EDT
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T070000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:EWT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Egypt.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Egypt.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Egypt.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,131 +1,123 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Egypt
 X-LIC-LOCATION:Egypt
+BEGIN:STANDARD
+DTSTART:19001001T000000
+RDATE:19001001T000000
+TZNAME:EEST
+TZOFFSETFROM:+0205
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19400715T000000
+RDATE:19400715T000000
+RDATE:19410415T000000
+RDATE:19450416T000000
+RDATE:19570510T000000
+RDATE:19580501T000000
+RDATE:19820725T010000
+RDATE:19830712T010000
+RDATE:19890506T010000
+RDATE:20100910T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19420401T000000
-RRULE:FREQ=YEARLY;UNTIL=19440331T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19401001T000000
+RDATE:19401001T000000
+RDATE:19410916T000000
+RDATE:19421027T000000
+RDATE:20060922T000000
+RDATE:20070907T000000
+RDATE:20080829T000000
+RDATE:20090821T000000
+RDATE:20100811T000000
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19431101T000000
-RRULE:FREQ=YEARLY;UNTIL=19451031T210000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420401T000000
+RRULE:FREQ=YEARLY;UNTIL=19440331T220000Z;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19431101T000000
+RRULE:FREQ=YEARLY;UNTIL=19451031T210000Z;BYMONTH=11
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19571001T000000
-RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z
+RRULE:FREQ=YEARLY;UNTIL=19580930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19590501T010000
+RRULE:FREQ=YEARLY;UNTIL=19810430T230000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19590501T010000
-RRULE:FREQ=YEARLY;UNTIL=19810430T230000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19590930T030000
+RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19590930T030000
-RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19661001T030000
+RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19661001T030000
-RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19840501T010000
+RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19840501T010000
-RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19900501T010000
+RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z;BYMONTH=5
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19900501T010000
-RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19950428T000000
+RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19950428T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1FR
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19950929T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=25,26,27,28,29,30;BYDAY=FR;UNTIL=20020926T210000Z
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=1;BYDAY=FR;UNTIL=20020926T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
+RRULE:FREQ=YEARLY;UNTIL=20050929T210000Z;BYDAY=FR;BYYEARDAY=-92,-93,-94,-9
+ 5,-96,-97,-98
 TZNAME:EET
-DTSTART:20030925T230000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1TH;UNTIL=20050929T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20080828T230000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYDAY=-1TH
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0205
-TZOFFSETTO:+0200
+DTSTART:20101001T000000
+RRULE:FREQ=YEARLY;BYDAY=FR;BYYEARDAY=-92,-93,-94,-95,-96,-97,-98
 TZNAME:EET
-DTSTART:19001001T000000
-RDATE:19001001T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19400715T000000
-RDATE:19400715T000000
-RDATE:19410415T000000
-RDATE:19450416T000000
-RDATE:19570510T000000
-RDATE:19580501T000000
-RDATE:19820725T010000
-RDATE:19830712T010000
-RDATE:19890506T010000
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19401001T000000
-RDATE:19401001T000000
-RDATE:19410916T000000
-RDATE:19421027T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20060921T230000
-RDATE:20060921T230000
-RDATE:20070906T230000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Eire.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Eire.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Eire.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,238 +1,280 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Eire
 X-LIC-LOCATION:Eire
 BEGIN:STANDARD
+DTSTART:18800802T000000
+RDATE:18800802T000000
+TZNAME:DMT
+TZOFFSETFROM:-0025
+TZOFFSETTO:-002521
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19160521T020000
+RDATE:19160521T020000
+TZNAME:IST
+TZOFFSETFROM:-002521
+TZOFFSETTO:+003439
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19161001T030000
+RDATE:19161001T030000
+TZNAME:S
+TZOFFSETFROM:+003439
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170408T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170917T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19461006T020000
+RDATE:19471102T020000
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19211206T000000
+RDATE:19211206T000000
+RDATE:19960101T000000
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19220326T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19221008T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+RDATE:19711031T030000
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400225T020000
+RDATE:19400225T020000
+RDATE:19470316T020000
 TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19480418T020000
+RDATE:19480418T020000
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19601002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;UNTIL=19590419T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;UNTIL=19671029T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:IST
 DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+RRULE:FREQ=YEARLY;UNTIL=19670319T020000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
+TZNAME:IST
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;UNTIL=19800316T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;UNTIL=19801026T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0025
-TZOFFSETTO:-002521
-TZNAME:DMT
-DTSTART:18800802T000000
-RDATE:18800802T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-002521
-TZOFFSETTO:+003439
-TZNAME:IST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+003439
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-END:STANDARD
-BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19170408T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19891029T010000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19170917T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19461006T020000
-RDATE:19471102T020000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19211206T000000
-RDATE:19211206T000000
-RDATE:19960101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19220326T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19470316T020000
-RDATE:19480418T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19681027T000000
-RDATE:19681027T000000
+TZOFFSETTO:+0000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+0.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+0.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+0
+X-LIC-LOCATION:Etc/GMT+0
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+1.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+1.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+1.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+1
+X-LIC-LOCATION:Etc/GMT+1
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+1
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+10.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+10.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+10.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+10
+X-LIC-LOCATION:Etc/GMT+10
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+10
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+11.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+11.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+11.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+11
+X-LIC-LOCATION:Etc/GMT+11
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+11
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+12.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+12.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+12.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+12
+X-LIC-LOCATION:Etc/GMT+12
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+12
+TZOFFSETFROM:-1200
+TZOFFSETTO:-1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+2.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+2.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+2.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+2
+X-LIC-LOCATION:Etc/GMT+2
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+2
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+3.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+3.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+3.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+3
+X-LIC-LOCATION:Etc/GMT+3
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+3
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+4.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+4.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+4.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+4
+X-LIC-LOCATION:Etc/GMT+4
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+4
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+5.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+5.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+5.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+5
+X-LIC-LOCATION:Etc/GMT+5
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+5
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+6.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+6.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+6.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+6
+X-LIC-LOCATION:Etc/GMT+6
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+6
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+7.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+7.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+7.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+7
+X-LIC-LOCATION:Etc/GMT+7
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+7
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+8.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+8.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+8.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+8
+X-LIC-LOCATION:Etc/GMT+8
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+8
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+9.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+9.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+9.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT+9
+X-LIC-LOCATION:Etc/GMT+9
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT+9
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-0.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-0.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-0
+X-LIC-LOCATION:Etc/GMT-0
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-1.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-1.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-1.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-1
+X-LIC-LOCATION:Etc/GMT-1
+BEGIN:STANDARD
+DTSTART:18000101T010000
+RDATE:18000101T010000
+TZNAME:GMT-1
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-10.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-10.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-10.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-10
+X-LIC-LOCATION:Etc/GMT-10
+BEGIN:STANDARD
+DTSTART:18000101T100000
+RDATE:18000101T100000
+TZNAME:GMT-10
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-11.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-11.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-11.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-11
+X-LIC-LOCATION:Etc/GMT-11
+BEGIN:STANDARD
+DTSTART:18000101T110000
+RDATE:18000101T110000
+TZNAME:GMT-11
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-12.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-12.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-12.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-12
+X-LIC-LOCATION:Etc/GMT-12
+BEGIN:STANDARD
+DTSTART:18000101T120000
+RDATE:18000101T120000
+TZNAME:GMT-12
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-13.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-13.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-13.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-13
+X-LIC-LOCATION:Etc/GMT-13
+BEGIN:STANDARD
+DTSTART:18000101T130000
+RDATE:18000101T130000
+TZNAME:GMT-13
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-14.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-14.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-14.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-14
+X-LIC-LOCATION:Etc/GMT-14
+BEGIN:STANDARD
+DTSTART:18000101T140000
+RDATE:18000101T140000
+TZNAME:GMT-14
+TZOFFSETFROM:+1400
+TZOFFSETTO:+1400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-2.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-2.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-2.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-2
+X-LIC-LOCATION:Etc/GMT-2
+BEGIN:STANDARD
+DTSTART:18000101T020000
+RDATE:18000101T020000
+TZNAME:GMT-2
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-3.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-3.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-3.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-3
+X-LIC-LOCATION:Etc/GMT-3
+BEGIN:STANDARD
+DTSTART:18000101T030000
+RDATE:18000101T030000
+TZNAME:GMT-3
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-4.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-4.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-4.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-4
+X-LIC-LOCATION:Etc/GMT-4
+BEGIN:STANDARD
+DTSTART:18000101T040000
+RDATE:18000101T040000
+TZNAME:GMT-4
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-5.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-5.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-5.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-5
+X-LIC-LOCATION:Etc/GMT-5
+BEGIN:STANDARD
+DTSTART:18000101T050000
+RDATE:18000101T050000
+TZNAME:GMT-5
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-6.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-6.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-6.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-6
+X-LIC-LOCATION:Etc/GMT-6
+BEGIN:STANDARD
+DTSTART:18000101T060000
+RDATE:18000101T060000
+TZNAME:GMT-6
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-7.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-7.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-7.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-7
+X-LIC-LOCATION:Etc/GMT-7
+BEGIN:STANDARD
+DTSTART:18000101T070000
+RDATE:18000101T070000
+TZNAME:GMT-7
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-8.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-8.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-8.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-8
+X-LIC-LOCATION:Etc/GMT-8
+BEGIN:STANDARD
+DTSTART:18000101T080000
+RDATE:18000101T080000
+TZNAME:GMT-8
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-9.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-9.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-9.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT-9
+X-LIC-LOCATION:Etc/GMT-9
+BEGIN:STANDARD
+DTSTART:18000101T090000
+RDATE:18000101T090000
+TZNAME:GMT-9
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT
+X-LIC-LOCATION:Etc/GMT
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT0.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT0.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/GMT0
+X-LIC-LOCATION:Etc/GMT0
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Greenwich.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Greenwich.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Greenwich.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/Greenwich
+X-LIC-LOCATION:Etc/Greenwich
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UCT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UCT.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UCT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/UCT
+X-LIC-LOCATION:Etc/UCT
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:UCT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UTC.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UTC.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UTC.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/UTC
+X-LIC-LOCATION:Etc/UTC
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:UTC
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Universal.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Universal.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Universal.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/Universal
+X-LIC-LOCATION:Etc/Universal
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:UTC
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Zulu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Zulu.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Zulu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Etc/Zulu
+X-LIC-LOCATION:Etc/Zulu
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:UTC
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Amsterdam.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Amsterdam.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Amsterdam.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,156 +1,159 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Amsterdam
 X-LIC-LOCATION:Europe/Amsterdam
+BEGIN:STANDARD
+DTSTART:18350101T000000
+RDATE:18350101T000000
+TZNAME:S
+TZOFFSETFROM:+001932
+TZOFFSETTO:+001932
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160501T000000
+RDATE:19160501T000000
+RDATE:19170416T020000
+RDATE:19220326T020000
+RDATE:19230601T020000
+RDATE:19240330T020000
+RDATE:19250605T020000
+RDATE:19320522T020000
+RDATE:19370522T020000
+TZNAME:NST
 TZOFFSETFROM:+001932
 TZOFFSETTO:+011932
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T000000
+RDATE:19161001T000000
+RDATE:19170917T030000
+TZNAME:AMT
+TZOFFSETFROM:+011932
+TZOFFSETTO:+001932
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180401T020000
+RRULE:FREQ=YEARLY;UNTIL=19210404T014028Z;BYDAY=1MO;BYMONTH=4
 TZNAME:NST
-DTSTART:19180401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19210404T014028Z
+TZOFFSETFROM:+001932
+TZOFFSETTO:+011932
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19180930T030000
+RRULE:FREQ=YEARLY;UNTIL=19210926T014028Z;BYDAY=-1MO;BYMONTH=9
+TZNAME:AMT
 TZOFFSETFROM:+011932
 TZOFFSETTO:+001932
-TZNAME:AMT
-DTSTART:19180930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1MO;UNTIL=19210926T014028Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19221008T030000
+RRULE:FREQ=YEARLY;UNTIL=19361004T014028Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:AMT
 TZOFFSETFROM:+011932
 TZOFFSETTO:+001932
-TZNAME:AMT
-DTSTART:19221008T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19361004T014028Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19260515T020000
+RRULE:FREQ=YEARLY;UNTIL=19310515T014028Z;BYMONTH=5
+TZNAME:NST
 TZOFFSETFROM:+001932
 TZOFFSETTO:+011932
-TZNAME:NST
-DTSTART:19260515T020000
-RRULE:FREQ=YEARLY;UNTIL=19310515T014028Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19330515T020000
+RRULE:FREQ=YEARLY;UNTIL=19360515T014028Z;BYMONTH=5
+TZNAME:NST
 TZOFFSETFROM:+001932
 TZOFFSETTO:+011932
-TZNAME:NST
-DTSTART:19330515T020000
-RRULE:FREQ=YEARLY;UNTIL=19360515T014028Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19370701T000000
+RDATE:19370701T000000
+TZNAME:NEST
+TZOFFSETFROM:+011932
+TZOFFSETTO:+0120
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19371003T030000
+RRULE:FREQ=YEARLY;UNTIL=19391008T014000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:NET
 TZOFFSETFROM:+0120
 TZOFFSETTO:+0020
-TZNAME:NET
-DTSTART:19371003T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19391008T014000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19380515T020000
+RRULE:FREQ=YEARLY;UNTIL=19390515T014000Z;BYMONTH=5
+TZNAME:NEST
 TZOFFSETFROM:+0020
 TZOFFSETTO:+0120
-TZNAME:NEST
-DTSTART:19380515T020000
-RRULE:FREQ=YEARLY;UNTIL=19390515T014000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
+BEGIN:STANDARD
+DTSTART:19400516T000000
+RDATE:19400516T000000
+TZNAME:CEST
+TZOFFSETFROM:+0020
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19770403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+RDATE:19770925T030000
+RDATE:19781001T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19770101T000000
+RDATE:19770101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+001932
-TZOFFSETTO:+001932
-TZNAME:AMT
-DTSTART:18350101T000000
-RDATE:18350101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+001932
-TZOFFSETTO:+011932
-TZNAME:NST
-DTSTART:19160501T000000
-RDATE:19160501T000000
-RDATE:19170416T020000
-RDATE:19220326T020000
-RDATE:19230601T020000
-RDATE:19240330T020000
-RDATE:19250605T020000
-RDATE:19320522T020000
-RDATE:19370522T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+011932
-TZOFFSETTO:+001932
-TZNAME:AMT
-DTSTART:19161001T000000
-RDATE:19161001T000000
-RDATE:19170917T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+011932
-TZOFFSETTO:+0120
-TZNAME:NEST
-DTSTART:19370701T000000
-RDATE:19370701T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0020
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19400516T000000
-RDATE:19400516T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
-RDATE:19770925T030000
-RDATE:19781001T030000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19430329T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19770101T000000
-RDATE:19770101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Andorra.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Andorra.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Andorra.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Andorra
 X-LIC-LOCATION:Europe/Andorra
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:WET
+TZOFFSETFROM:+000604
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460930T000000
+RDATE:19460930T000000
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19850929T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19850929T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+000604
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19010101T000000
-RDATE:19010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19460930T000000
-RDATE:19460930T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Athens.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Athens.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Athens.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,55 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Athens
 X-LIC-LOCATION:Europe/Athens
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19770403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19780402T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19810329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19810927T040000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18950914T000000
+RDATE:18950914T000000
+TZNAME:AMT
 TZOFFSETFROM:+013452
 TZOFFSETTO:+013452
-TZNAME:AMT
-DTSTART:18950914T000000
-RDATE:18950914T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19160728T000100
+RDATE:19160728T000100
+TZNAME:EEST
 TZOFFSETFROM:+013452
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19160728T000100
-RDATE:19160728T000100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
 DTSTART:19320707T000000
 RDATE:19320707T000000
 RDATE:19410407T000000
@@ -58,11 +28,11 @@
 RDATE:19760411T020000
 RDATE:19790401T090000
 RDATE:19800401T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19320901T000000
 RDATE:19320901T000000
 RDATE:19521102T000000
@@ -72,42 +42,73 @@
 RDATE:19780924T040000
 RDATE:19790929T020000
 RDATE:19800928T000000
-END:STANDARD
-BEGIN:DAYLIGHT
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:CEST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19410430T000000
 RDATE:19410430T000000
-END:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19431004T000000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19430330T000000
+RDATE:19430330T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19430330T000000
-RDATE:19430330T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19440404T000000
+RDATE:19440404T000000
+TZNAME:EEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19440404T000000
-RDATE:19440404T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;UNTIL=19780402T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19810101T000000
+RDATE:19810101T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19810927T040000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:EET
-DTSTART:19810101T000000
-RDATE:19810101T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belfast.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belfast.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belfast.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,258 +1,291 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Belfast
 X-LIC-LOCATION:Europe/Belfast
 BEGIN:STANDARD
+DTSTART:18471201T000000
+RDATE:18471201T000000
+TZNAME:S
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160521T020000
+RDATE:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T030000
+RDATE:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
 TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19410504T020000
+RDATE:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;UNTIL=19430815T010000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=8
+TZNAME:BST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;UNTIL=19440402T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:BDST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19440917T030000
+RDATE:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;UNTIL=19461006T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19601002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;UNTIL=19590419T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;UNTIL=19671029T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;UNTIL=19670319T020000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
 TZNAME:BST
-DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19711031T030000
+RDATE:19711031T030000
+TZNAME:S
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;UNTIL=19800316T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;UNTIL=19801026T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19891029T010000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
 TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-000115
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18471201T000000
-RDATE:18471201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19460414T020000
-RDATE:19470316T020000
-RDATE:19480314T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19471102T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19410504T020000
-RDATE:19410504T020000
-RDATE:19450402T020000
-RDATE:19470413T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19440917T030000
-RDATE:19440917T030000
-RDATE:19450715T030000
-RDATE:19470810T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19681027T000000
-RDATE:19681027T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belgrade.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belgrade.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belgrade.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,77 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Belgrade
 X-LIC-LOCATION:Europe/Belgrade
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:CET
+TZOFFSETFROM:+0122
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410418T230000
+RDATE:19410418T230000
+RDATE:19450508T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19830925T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0122
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410418T230000
-RDATE:19410418T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450508T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830925T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19450101T000000
-RDATE:19450101T000000
-RDATE:19821127T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Berlin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Berlin.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Berlin.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,69 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Berlin
 X-LIC-LOCATION:Europe/Berlin
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
+DTSTART:18930401T000000
+RDATE:18930401T000000
 TZNAME:CEST
-DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+005328
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18930401T000000
-RDATE:18930401T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160430T230000
 RDATE:19160430T230000
 RDATE:19400401T020000
@@ -73,11 +22,11 @@
 RDATE:19480418T020000
 RDATE:19490410T020000
 RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19421102T030000
@@ -85,30 +34,82 @@
 RDATE:19441002T030000
 RDATE:19451118T030000
 RDATE:19461007T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:CEMT
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;UNTIL=19450402T010000Z;BYDAY=1MO;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 DTSTART:19450524T020000
 RDATE:19450524T020000
 RDATE:19470511T030000
+TZNAME:CEMT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19450924T030000
 RDATE:19450924T030000
 RDATE:19470629T030000
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19460101T000000
 RDATE:19460101T000000
 RDATE:19800101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bratislava.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bratislava.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bratislava.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,104 +1,111 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Bratislava
 X-LIC-LOCATION:Europe/Bratislava
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
+DTSTART:18500101T000000
+RDATE:18500101T000000
+TZNAME:PMT
+TZOFFSETFROM:+005744
+TZOFFSETTO:+005744
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:18911001T000000
+RDATE:18911001T000000
+TZNAME:CEST
+TZOFFSETFROM:+005744
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19461006T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450408T020000
+RDATE:19460506T020000
+RDATE:19470420T020000
+RDATE:19480418T020000
+RDATE:19490409T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19790401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19451118T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+005744
-TZOFFSETTO:+005744
-TZNAME:PMT
-DTSTART:18500101T000000
-RDATE:18500101T000000
+DTSTART:19440917T030000
+RDATE:19440917T030000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+005744
+DTSTART:19461006T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18911001T000000
-RDATE:18911001T000000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790101T000000
+RDATE:19790101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790401T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19160430T230000
-RDATE:19160430T230000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450408T020000
-RDATE:19460506T020000
-RDATE:19470420T020000
-RDATE:19480418T020000
-RDATE:19490409T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19440917T030000
-RDATE:19451118T030000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790101T000000
-RDATE:19790101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Brussels.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Brussels.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Brussels.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,102 +1,40 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Brussels
 X-LIC-LOCATION:Europe/Brussels
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19221008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19271001T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19281007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19770403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:BMT
 TZOFFSETFROM:+001730
 TZOFFSETTO:+001730
-TZNAME:BMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18920501T120000
+RDATE:18920501T120000
+TZNAME:WET
 TZOFFSETFROM:+001730
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:18920501T120000
-RDATE:18920501T120000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19141108T000000
+RDATE:19141108T000000
+TZNAME:CET
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19141108T000000
-RDATE:19141108T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
+BEGIN:STANDARD
 DTSTART:19160501T000000
 RDATE:19160501T000000
 RDATE:19400520T030000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19460519T020000
-END:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19421102T030000
@@ -106,22 +44,32 @@
 RDATE:19461007T030000
 RDATE:19770925T030000
 RDATE:19781001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19181111T120000
+RDATE:19181111T120000
+TZNAME:WEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19181111T120000
-RDATE:19181111T120000
-RDATE:19191005T000000
-RDATE:19201024T000000
-RDATE:19211026T000000
-RDATE:19391119T030000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:WEST
 DTSTART:19190301T230000
 RDATE:19190301T230000
 RDATE:19200214T230000
@@ -145,20 +93,87 @@
 RDATE:19380327T020000
 RDATE:19390416T020000
 RDATE:19400225T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19191005T000000
+RDATE:19191005T000000
+RDATE:19201024T000000
+RDATE:19211026T000000
+RDATE:19391119T030000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19221008T000000
+RRULE:FREQ=YEARLY;UNTIL=19271001T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19281007T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460519T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19440903T000000
 RDATE:19440903T000000
-END:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19770101T000000
+RDATE:19770101T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
-DTSTART:19770101T000000
-RDATE:19770101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bucharest.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bucharest.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bucharest.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,119 +1,121 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Bucharest
 X-LIC-LOCATION:Europe/Bucharest
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
+DTSTART:18911001T000000
+RDATE:18911001T000000
+TZNAME:BMT
+TZOFFSETFROM:+014424
+TZOFFSETTO:+014424
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310724T000000
+RDATE:19310724T000000
+TZNAME:EEST
+TZOFFSETFROM:+014424
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19321002T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19390930T220000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19320521T000000
+RDATE:19320521T000000
+RDATE:19790527T000000
+RDATE:19800405T230000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19330402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19390401T220000Z
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19321002T010000
+RRULE:FREQ=YEARLY;UNTIL=19390930T220000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19330402T000000
+RRULE:FREQ=YEARLY;UNTIL=19390401T220000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900325T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790930T000000
+RDATE:19790930T000000
+RDATE:19800928T010000
+RDATE:19961027T000000
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19810927T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900930T000000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;UNTIL=19900325T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19910331T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19930327T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;UNTIL=19900930T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910929T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19930925T220000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+RDATE:19940101T000000
+RDATE:19970101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19910331T000000
+RRULE:FREQ=YEARLY;UNTIL=19930327T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19940327T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910929T010000
+RRULE:FREQ=YEARLY;UNTIL=19930925T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19940925T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19940327T000000
+RRULE:FREQ=YEARLY;UNTIL=19960330T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19970330T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19940925T000000
+RRULE:FREQ=YEARLY;UNTIL=19950923T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19971026T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+014424
-TZOFFSETTO:+014424
-TZNAME:BMT
-DTSTART:18911001T000000
-RDATE:18911001T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+014424
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19310724T000000
-RDATE:19310724T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19970330T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19320521T000000
-RDATE:19320521T000000
-RDATE:19790527T000000
-RDATE:19800405T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19971026T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19790930T000000
-RDATE:19790930T000000
-RDATE:19800928T010000
-RDATE:19961027T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910101T000000
-RDATE:19910101T000000
-RDATE:19940101T000000
-RDATE:19970101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Budapest.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Budapest.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Budapest.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,76 +1,24 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Budapest
 X-LIC-LOCATION:Europe/Budapest
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19461006T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
+DTSTART:18901001T000000
+RDATE:18901001T000000
 TZNAME:CEST
-DTSTART:19470406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=4,5,6,7,8,9,10;BYDAY=SU;UNTIL=19490410T010000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19540523T000000
-RRULE:FREQ=YEARLY;UNTIL=19550522T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19541003T000000
-RRULE:FREQ=YEARLY;UNTIL=19551002T220000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+011620
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18901001T000000
-RDATE:18901001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160430T230000
 RDATE:19160430T230000
 RDATE:19170416T020000
 RDATE:19180401T030000
 RDATE:19190415T030000
 RDATE:19200405T030000
-RDATE:19410406T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
 RDATE:19450501T230000
@@ -79,11 +27,11 @@
 RDATE:19560603T000000
 RDATE:19570602T010000
 RDATE:19800406T010000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19170917T030000
@@ -97,14 +45,74 @@
 RDATE:19501023T030000
 RDATE:19560930T000000
 RDATE:19570929T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19180101T000000
 RDATE:19180101T000000
 RDATE:19450101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410406T020000
+RDATE:19410406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19461006T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;UNTIL=19490410T010000Z;BYDAY=SU;BYMONTHDAY=4,5,6,7,8,9,1
+ 0;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19540523T000000
+RRULE:FREQ=YEARLY;UNTIL=19550522T230000Z;BYMONTH=5
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19541003T000000
+RRULE:FREQ=YEARLY;UNTIL=19551002T220000Z;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Chisinau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Chisinau.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Chisinau.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,168 +1,171 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Chisinau
 X-LIC-LOCATION:Europe/Chisinau
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19321002T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19390930T220000Z
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:CMT
+TZOFFSETFROM:+015520
+TZOFFSETTO:+0155
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19330402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19390401T220000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+DTSTART:19180215T000000
+RDATE:19180215T000000
+TZNAME:BMT
+TZOFFSETFROM:+0155
+TZOFFSETTO:+014424
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19890325T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19310724T000000
+RDATE:19310724T000000
+TZNAME:EEST
+TZOFFSETFROM:+014424
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910101T000000
-RRULE:FREQ=YEARLY;UNTIL=19911231T220000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19320521T000000
+RDATE:19320521T000000
+RDATE:19910331T020000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19920329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19321002T010000
+RRULE:FREQ=YEARLY;UNTIL=19390930T220000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19920927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19330402T000000
+RRULE:FREQ=YEARLY;UNTIL=19390401T220000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19970330T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19971026T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19400815T000000
+RDATE:19400815T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+015520
-TZOFFSETTO:+0155
-TZNAME:CMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0155
-TZOFFSETTO:+014424
-TZNAME:BMT
-DTSTART:19180215T000000
-RDATE:19180215T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+014424
+DTSTART:19410717T000000
+RDATE:19410717T000000
+TZNAME:CEST
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19310724T000000
-RDATE:19310724T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19320521T000000
-RDATE:19320521T000000
-RDATE:19400815T000000
-RDATE:19910331T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410717T000000
-RDATE:19410717T000000
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19431004T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19430329T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19440824T000000
+RDATE:19440824T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19440824T000000
-RDATE:19440824T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19890923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19890325T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:MSK
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900101T000000
 RDATE:19900101T000000
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19900506T000000
 RDATE:19900506T000000
 RDATE:19910929T030000
 RDATE:19961027T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+RDATE:19920101T000000
+RDATE:19970101T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;UNTIL=19960330T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;UNTIL=19950923T210000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:EET
-DTSTART:19970101T000000
-RDATE:19970101T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19971026T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Copenhagen.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Copenhagen.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Copenhagen.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,48 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Copenhagen
 X-LIC-LOCATION:Europe/Copenhagen
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
 TZOFFSETFROM:+005020
 TZOFFSETTO:+005020
-TZNAME:CMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18940101T000000
+RDATE:18940101T000000
+TZNAME:CEST
 TZOFFSETFROM:+005020
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18940101T000000
-RDATE:18940101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160514T230000
 RDATE:19160514T230000
 RDATE:19400515T000000
@@ -53,11 +30,11 @@
 RDATE:19470504T020000
 RDATE:19480509T020000
 RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19160930T230000
 RDATE:19160930T230000
 RDATE:19421102T030000
@@ -67,13 +44,37 @@
 RDATE:19460901T030000
 RDATE:19470810T030000
 RDATE:19480808T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
-DTSTART:19800101T000000
-RDATE:19800101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Dublin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Dublin.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Dublin.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,238 +1,280 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Dublin
 X-LIC-LOCATION:Europe/Dublin
 BEGIN:STANDARD
+DTSTART:18800802T000000
+RDATE:18800802T000000
+TZNAME:DMT
+TZOFFSETFROM:-0025
+TZOFFSETTO:-002521
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19160521T020000
+RDATE:19160521T020000
+TZNAME:IST
+TZOFFSETFROM:-002521
+TZOFFSETTO:+003439
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19161001T030000
+RDATE:19161001T030000
+TZNAME:S
+TZOFFSETFROM:+003439
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170408T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170917T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19461006T020000
+RDATE:19471102T020000
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19211206T000000
+RDATE:19211206T000000
+RDATE:19960101T000000
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19220326T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19221008T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+RDATE:19711031T030000
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400225T020000
+RDATE:19400225T020000
+RDATE:19470316T020000
 TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19480418T020000
+RDATE:19480418T020000
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19601002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;UNTIL=19590419T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;UNTIL=19671029T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:IST
 DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
+RRULE:FREQ=YEARLY;UNTIL=19670319T020000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
+TZNAME:IST
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;UNTIL=19800316T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;UNTIL=19801026T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0025
-TZOFFSETTO:-002521
-TZNAME:DMT
-DTSTART:18800802T000000
-RDATE:18800802T000000
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-002521
-TZOFFSETTO:+003439
-TZNAME:IST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+003439
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-END:STANDARD
-BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19170408T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19891029T010000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19170917T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19461006T020000
-RDATE:19471102T020000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19211206T000000
-RDATE:19211206T000000
-RDATE:19960101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19220326T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19470316T020000
-RDATE:19480418T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/IST
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:IST
-DTSTART:19681027T000000
-RDATE:19681027T000000
+TZOFFSETTO:+0000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Gibraltar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Gibraltar.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Gibraltar.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,132 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Gibraltar
 X-LIC-LOCATION:Europe/Gibraltar
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19561007T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19820328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19820926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800802T000000
+RDATE:18800802T000000
+TZNAME:S
 TZOFFSETFROM:-002124
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18800802T000000
-RDATE:18800802T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:BST
 DTSTART:19160521T020000
 RDATE:19160521T020000
 RDATE:19170408T020000
@@ -151,11 +37,11 @@
 RDATE:19490403T020000
 RDATE:19530419T020000
 RDATE:19540411T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:GMT
 DTSTART:19161001T030000
 RDATE:19161001T030000
 RDATE:19170917T030000
@@ -168,38 +54,166 @@
 RDATE:19471102T030000
 RDATE:19481031T030000
 RDATE:19491030T030000
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 DTSTART:19410504T020000
 RDATE:19410504T020000
 RDATE:19450402T020000
 RDATE:19470413T020000
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;UNTIL=19430815T010000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=8
+TZNAME:BST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:BST
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;UNTIL=19440402T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 DTSTART:19440917T030000
 RDATE:19440917T030000
 RDATE:19450715T030000
 RDATE:19470810T030000
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;UNTIL=19461006T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19570414T020000
-RDATE:19570414T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19561007T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19570414T020000
+RDATE:19570414T020000
 TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19820101T000000
 RDATE:19820101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19820328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19820926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Guernsey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Guernsey.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Guernsey.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,258 +1,291 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Guernsey
 X-LIC-LOCATION:Europe/Guernsey
 BEGIN:STANDARD
+DTSTART:18471201T000000
+RDATE:18471201T000000
+TZNAME:S
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160521T020000
+RDATE:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T030000
+RDATE:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
 TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19410504T020000
+RDATE:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;UNTIL=19430815T010000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=8
+TZNAME:BST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;UNTIL=19440402T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:BDST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19440917T030000
+RDATE:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;UNTIL=19461006T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19601002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;UNTIL=19590419T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;UNTIL=19671029T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;UNTIL=19670319T020000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
 TZNAME:BST
-DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19711031T030000
+RDATE:19711031T030000
+TZNAME:S
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;UNTIL=19800316T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;UNTIL=19801026T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19891029T010000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
 TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-000115
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18471201T000000
-RDATE:18471201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19460414T020000
-RDATE:19470316T020000
-RDATE:19480314T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19471102T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19410504T020000
-RDATE:19410504T020000
-RDATE:19450402T020000
-RDATE:19470413T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19440917T030000
-RDATE:19440917T030000
-RDATE:19450715T030000
-RDATE:19470810T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19681027T000000
-RDATE:19681027T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Helsinki.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Helsinki.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Helsinki.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,79 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Helsinki
 X-LIC-LOCATION:Europe/Helsinki
+BEGIN:STANDARD
+DTSTART:18780531T000000
+RDATE:18780531T000000
+TZNAME:HMT
+TZOFFSETFROM:+013952
+TZOFFSETTO:+013952
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19210501T000000
+RDATE:19210501T000000
+TZNAME:EEST
+TZOFFSETFROM:+013952
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420403T000000
+RDATE:19420403T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19810329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421003T000000
+RDATE:19421003T000000
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19810927T040000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;UNTIL=19820328T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;UNTIL=19820926T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+013952
-TZOFFSETTO:+013952
-TZNAME:HMT
-DTSTART:18780531T000000
-RDATE:18780531T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+013952
+DTSTART:19830101T000000
+RDATE:19830101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19210501T000000
-RDATE:19210501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830327T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19420403T000000
-RDATE:19420403T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830925T040000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19421003T000000
-RDATE:19421003T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19961027T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19810329T020000
-RDATE:19810329T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Isle_of_Man.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Isle_of_Man.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Isle_of_Man.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,258 +1,291 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Isle_of_Man
 X-LIC-LOCATION:Europe/Isle_of_Man
 BEGIN:STANDARD
+DTSTART:18471201T000000
+RDATE:18471201T000000
+TZNAME:S
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160521T020000
+RDATE:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T030000
+RDATE:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
 TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19410504T020000
+RDATE:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;UNTIL=19430815T010000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=8
+TZNAME:BST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;UNTIL=19440402T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:BDST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19440917T030000
+RDATE:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;UNTIL=19461006T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19601002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;UNTIL=19590419T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;UNTIL=19671029T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;UNTIL=19670319T020000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
 TZNAME:BST
-DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19711031T030000
+RDATE:19711031T030000
+TZNAME:S
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;UNTIL=19800316T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;UNTIL=19801026T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19891029T010000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
 TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-000115
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18471201T000000
-RDATE:18471201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19460414T020000
-RDATE:19470316T020000
-RDATE:19480314T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19471102T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19410504T020000
-RDATE:19410504T020000
-RDATE:19450402T020000
-RDATE:19470413T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19440917T030000
-RDATE:19440917T030000
-RDATE:19450715T030000
-RDATE:19470810T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19681027T000000
-RDATE:19681027T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Istanbul.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Istanbul.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Istanbul.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,139 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Istanbul
 X-LIC-LOCATION:Europe/Istanbul
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19241001T000000
-RRULE:FREQ=YEARLY;UNTIL=19250930T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19470420T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19480417T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19471005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19501007T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19700503T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19720506T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701004T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19721007T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19751026T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19761030T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19770403T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19780401T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:TRT
-DTSTART:19791015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=MO;UNTIL=19821010T200000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:TRST
-DTSTART:19810329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19860330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900325T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19860928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900930T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19910331T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20060325T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061028T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:20070325T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20071028T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:IMT
 TZOFFSETFROM:+015552
 TZOFFSETTO:+015656
-TZNAME:IMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19101001T000000
+RDATE:19101001T000000
+TZNAME:EEST
 TZOFFSETFROM:+015656
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19101001T000000
-RDATE:19101001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
 DTSTART:19160501T000000
 RDATE:19160501T000000
 RDATE:19200328T000000
@@ -155,11 +41,11 @@
 RDATE:19740331T020000
 RDATE:19750330T000000
 RDATE:19760601T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19161001T000000
 RDATE:19161001T000000
 RDATE:19201025T000000
@@ -177,43 +63,174 @@
 RDATE:19741103T050000
 RDATE:19771016T000000
 RDATE:19850928T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19241001T000000
+RRULE:FREQ=YEARLY;UNTIL=19250930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19470420T000000
+RRULE:FREQ=YEARLY;UNTIL=19480417T220000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19471005T000000
+RRULE:FREQ=YEARLY;UNTIL=19501007T210000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:TRST
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19700503T000000
+RRULE:FREQ=YEARLY;UNTIL=19720506T220000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19701004T000000
+RRULE:FREQ=YEARLY;UNTIL=19721007T210000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19751026T000000
+RRULE:FREQ=YEARLY;UNTIL=19761030T210000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T000000
+RRULE:FREQ=YEARLY;UNTIL=19780401T220000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19781015T000000
 RDATE:19781015T000000
-RDATE:19800406T030000
-RDATE:19830731T000000
-END:DAYLIGHT
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790401T030000
+RDATE:19790401T030000
+TZNAME:TRST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:TRST
-DTSTART:19790401T030000
-RDATE:19790401T030000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19791015T000000
+RRULE:FREQ=YEARLY;UNTIL=19821010T200000Z;BYDAY=-3MO;BYMONTH=10
+TZNAME:TRT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:TRT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800406T030000
+RRULE:FREQ=YEARLY;UNTIL=19800406T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19810329T030000
+RRULE:FREQ=YEARLY;UNTIL=19820328T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19830731T000000
+RDATE:19830731T000000
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19831002T000000
 RDATE:19831002T000000
+TZNAME:TRT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19850420T000000
+RDATE:19850420T000000
+TZNAME:EEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19860330T020000
+RRULE:FREQ=YEARLY;UNTIL=19900325T000000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EEST
-DTSTART:19850420T000000
-RDATE:19850420T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19860928T030000
+RRULE:FREQ=YEARLY;UNTIL=19900930T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19910331T010000
+RRULE:FREQ=YEARLY;UNTIL=20060325T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910929T020000
+RRULE:FREQ=YEARLY;UNTIL=19950923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061028T230000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20070101T000000
 RDATE:20070101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070325T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071028T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Jersey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Jersey.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Jersey.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,258 +1,291 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Jersey
 X-LIC-LOCATION:Europe/Jersey
 BEGIN:STANDARD
+DTSTART:18471201T000000
+RDATE:18471201T000000
+TZNAME:S
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160521T020000
+RDATE:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T030000
+RDATE:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
 TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19410504T020000
+RDATE:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;UNTIL=19430815T010000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=8
+TZNAME:BST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;UNTIL=19440402T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:BDST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19440917T030000
+RDATE:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;UNTIL=19461006T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19601002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;UNTIL=19590419T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;UNTIL=19671029T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;UNTIL=19670319T020000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
 TZNAME:BST
-DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19711031T030000
+RDATE:19711031T030000
+TZNAME:S
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;UNTIL=19800316T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;UNTIL=19801026T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19891029T010000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
 TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-000115
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18471201T000000
-RDATE:18471201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19460414T020000
-RDATE:19470316T020000
-RDATE:19480314T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19471102T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19410504T020000
-RDATE:19410504T020000
-RDATE:19450402T020000
-RDATE:19470413T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19440917T030000
-RDATE:19440917T030000
-RDATE:19450715T030000
-RDATE:19470810T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19681027T000000
-RDATE:19681027T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kaliningrad.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kaliningrad.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kaliningrad.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,148 +1,149 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Kaliningrad
 X-LIC-LOCATION:Europe/Kaliningrad
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
+BEGIN:STANDARD
+DTSTART:18930401T000000
+RDATE:18930401T000000
 TZNAME:CEST
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T000000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0122
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18930401T000000
-RDATE:18930401T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160430T230000
 RDATE:19160430T230000
 RDATE:19400401T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19421102T030000
 RDATE:19431004T030000
 RDATE:19441002T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
 TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19450101T000000
 RDATE:19450101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19450429T000000
+RDATE:19450429T000000
+TZNAME:CEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:CEST
-DTSTART:19450429T000000
-RDATE:19450429T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451101T000000
+RDATE:19451101T000000
+TZNAME:CET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:CET
-DTSTART:19451101T000000
-RDATE:19451101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19460101T000000
-RDATE:19460101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:EEST
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19910929T030000
 RDATE:19910929T030000
 RDATE:19920926T230000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:EEST
-DTSTART:19920328T230000
-RDATE:19920328T230000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kiev.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kiev.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kiev.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,137 +1,138 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Kiev
 X-LIC-LOCATION:Europe/Kiev
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19890325T230000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19920329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19920927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19940924T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19950326T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:KMT
 TZOFFSETFROM:+020204
 TZOFFSETTO:+020204
-TZNAME:KMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:EET
 TZOFFSETFROM:+020204
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19240502T000000
-RDATE:19240502T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:MSK
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19410920T000000
+RDATE:19410920T000000
+TZNAME:CEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410920T000000
-RDATE:19410920T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19431004T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19430329T020000
-RDATE:19430329T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19431106T000000
+RDATE:19431106T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19431106T000000
-RDATE:19431106T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19890923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19890325T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:MSK
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900101T000000
 RDATE:19900101T000000
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19900701T020000
 RDATE:19900701T020000
 RDATE:19950924T040000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19920101T000000
 RDATE:19920101T000000
 RDATE:19950101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;UNTIL=19940326T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;UNTIL=19940924T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Lisbon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Lisbon.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Lisbon.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,250 +1,261 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Lisbon
 X-LIC-LOCATION:Europe/Lisbon
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WEST
+TZOFFSETFROM:-003632
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160617T230000
+RDATE:19160617T230000
+RDATE:19170228T230000
+RDATE:19180301T230000
+RDATE:19190228T230000
+RDATE:19200229T230000
+RDATE:19210228T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+RDATE:19380326T230000
+RDATE:19390415T230000
+RDATE:19400224T230000
+RDATE:19410405T230000
+RDATE:19460406T230000
+RDATE:19770327T000000
+RDATE:19800330T000000
+RDATE:19830327T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161101T010000
+RDATE:19161101T010000
+RDATE:19241015T000000
+RDATE:19391119T000000
+RDATE:19461006T000000
+RDATE:19770925T010000
+RDATE:19781001T010000
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19171015T000000
+RRULE:FREQ=YEARLY;UNTIL=19211014T230000Z;BYMONTH=10
 TZNAME:WET
-DTSTART:19171015T000000
-RRULE:FREQ=YEARLY;UNTIL=19211014T230000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291005T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19261003T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19291005T230000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;UNTIL=19321001T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19311004T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19321001T230000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;UNTIL=19381001T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19341007T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381001T230000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411005T230000Z;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19401006T000000
-RRULE:FREQ=YEARLY;UNTIL=19411005T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420314T230000
+RRULE:FREQ=YEARLY;UNTIL=19450310T230000Z;BYDAY=2SA;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420425T230000
+RDATE:19420425T230000
+RDATE:19430417T230000
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420816T000000
+RDATE:19420816T000000
 TZNAME:WEST
-DTSTART:19420314T230000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19450310T230000Z
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;UNTIL=19451027T230000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19421025T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19451027T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19430829T000000
+RRULE:FREQ=YEARLY;UNTIL=19450825T220000Z;BYDAY=SU;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=8
+TZNAME:WEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19430829T000000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=26,27,28,29,30,31;BYDAY=SU;UNTIL=19450825T220000Z
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=1;BYDAY=SU;UNTIL=19450825T220000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19440422T230000
+RRULE:FREQ=YEARLY;UNTIL=19450421T220000Z;BYDAY=SA;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=4
+TZNAME:WEMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:WEMT
-DTSTART:19440422T230000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SA;UNTIL=19450421T220000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;UNTIL=19490403T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19470406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19490403T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T020000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;UNTIL=19650404T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19510401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19650404T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;UNTIL=19651003T020000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19511007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19651003T020000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19660403T020000
+RDATE:19660403T020000
+TZNAME:CET
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19760926T010000
+RDATE:19760926T010000
 TZNAME:WEST
-DTSTART:19780402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19790401T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19910929T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;UNTIL=19790401T000000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:WEST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T010000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19840325T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19920329T010000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19950326T010000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19820926T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19820328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19970330T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-003632
-TZOFFSETTO:-003632
-TZNAME:LMT
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-003632
+DTSTART:19830925T020000
+RRULE:FREQ=YEARLY;UNTIL=19910929T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;UNTIL=19920329T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19160617T230000
-RDATE:19160617T230000
-RDATE:19170228T230000
-RDATE:19180301T230000
-RDATE:19190228T230000
-RDATE:19200229T230000
-RDATE:19210228T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19310418T230000
-RDATE:19320402T230000
-RDATE:19340407T230000
-RDATE:19350330T230000
-RDATE:19360418T230000
-RDATE:19370403T230000
-RDATE:19380326T230000
-RDATE:19390415T230000
-RDATE:19400224T230000
-RDATE:19410405T230000
-RDATE:19460406T230000
-RDATE:19770327T000000
-RDATE:19800330T000000
-RDATE:19830327T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19920927T020000
+RDATE:19920927T020000
+TZNAME:CET
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19161101T010000
-RDATE:19161101T010000
-RDATE:19241015T000000
-RDATE:19391119T000000
-RDATE:19461006T000000
-RDATE:19760926T010000
-RDATE:19770925T010000
-RDATE:19781001T010000
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:WEMT
-DTSTART:19420425T230000
-RDATE:19420425T230000
-RDATE:19430417T230000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T020000
+RDATE:19960331T020000
 TZNAME:WEST
-DTSTART:19420816T000000
-RDATE:19420816T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19660403T020000
-RDATE:19660403T020000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19920927T020000
-RDATE:19920927T020000
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
+DTSTART:19970330T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19960331T020000
-RDATE:19960331T020000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Ljubljana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Ljubljana.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Ljubljana.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,77 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Ljubljana
 X-LIC-LOCATION:Europe/Ljubljana
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:CET
+TZOFFSETFROM:+0122
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410418T230000
+RDATE:19410418T230000
+RDATE:19450508T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19830925T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0122
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410418T230000
-RDATE:19410418T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450508T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830925T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19450101T000000
-RDATE:19450101T000000
-RDATE:19821127T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/London.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/London.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/London.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,258 +1,291 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/London
 X-LIC-LOCATION:Europe/London
 BEGIN:STANDARD
+DTSTART:18471201T000000
+RDATE:18471201T000000
+TZNAME:S
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160521T020000
+RDATE:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T030000
+RDATE:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
 TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19410504T020000
+RDATE:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;UNTIL=19430815T010000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=8
+TZNAME:BST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;UNTIL=19440402T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:BDST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19440917T030000
+RDATE:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;UNTIL=19461006T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19601002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;UNTIL=19590419T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;UNTIL=19671029T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;UNTIL=19670319T020000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
 TZNAME:BST
-DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19711031T030000
+RDATE:19711031T030000
+TZNAME:S
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;UNTIL=19800316T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;UNTIL=19801026T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19891029T010000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
 TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-000115
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18471201T000000
-RDATE:18471201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19460414T020000
-RDATE:19470316T020000
-RDATE:19480314T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19471102T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19410504T020000
-RDATE:19410504T020000
-RDATE:19450402T020000
-RDATE:19470413T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19440917T030000
-RDATE:19440917T030000
-RDATE:19450715T030000
-RDATE:19470810T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19681027T000000
-RDATE:19681027T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Luxembourg.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Luxembourg.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Luxembourg.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,100 +1,49 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Luxembourg
 X-LIC-LOCATION:Europe/Luxembourg
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19241005T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19281007T000000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19291006T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
+DTSTART:19040601T000000
+RDATE:19040601T000000
 TZNAME:CEST
-DTSTART:19770403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+002436
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19040601T000000
-RDATE:19040601T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160514T230000
 RDATE:19160514T230000
 RDATE:19170428T230000
 RDATE:19180415T020000
 RDATE:19450402T020000
 RDATE:19460519T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19170917T010000
 RDATE:19180916T030000
-RDATE:19440918T030000
 RDATE:19450916T030000
 RDATE:19461007T030000
 RDATE:19770925T030000
 RDATE:19781001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19181125T000000
+RDATE:19181125T000000
+TZNAME:WEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19181125T000000
-RDATE:19181125T000000
-RDATE:19191005T030000
-RDATE:19201024T020000
-RDATE:19211026T020000
-RDATE:19221008T010000
-RDATE:19231007T020000
-RDATE:19391119T030000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:WEST
 DTSTART:19190301T230000
 RDATE:19190301T230000
 RDATE:19200214T230000
@@ -118,30 +67,102 @@
 RDATE:19380327T020000
 RDATE:19390416T020000
 RDATE:19400225T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19191005T030000
+RDATE:19191005T030000
+RDATE:19201024T020000
+RDATE:19211026T020000
+RDATE:19221008T010000
+RDATE:19231007T020000
+RDATE:19391119T030000
+TZNAME:WET
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:WEST
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19241005T010000
+RRULE:FREQ=YEARLY;UNTIL=19281007T000000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19291006T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19400514T030000
 RDATE:19400514T030000
+TZNAME:WEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+TZNAME:WET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
+TZNAME:WEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19440918T030000
+RDATE:19440918T030000
+TZNAME:CEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:WET
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19770101T000000
+RDATE:19770101T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
-DTSTART:19770101T000000
-RDATE:19770101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Madrid.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Madrid.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Madrid.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,165 +1,176 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Madrid
 X-LIC-LOCATION:Europe/Madrid
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:WEST
+TZOFFSETFROM:-001444
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170505T230000
+RDATE:19170505T230000
+RDATE:19180415T230000
+RDATE:19190405T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19370522T230000
+RDATE:19380322T230000
+RDATE:19390415T230000
+RDATE:19400316T230000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19171007T000000
+RRULE:FREQ=YEARLY;UNTIL=19191006T230000Z;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19241005T000000
+RDATE:19241005T000000
 TZNAME:WET
-DTSTART:19171007T000000
-RRULE:FREQ=YEARLY;UNTIL=19191006T230000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291005T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19261003T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19291005T230000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19371003T000000
+RRULE:FREQ=YEARLY;UNTIL=19391007T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19371003T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19391007T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420502T230000
+RDATE:19420502T230000
+TZNAME:WEMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:WEMT
-DTSTART:19430417T230000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=13,14,15,16,17,18,19;BYDAY=SA;UNTIL=19460413T220000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420902T000000
+RDATE:19420902T000000
+RDATE:19431004T000000
+RDATE:19441011T000000
+RDATE:19450930T010000
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19430417T230000
+RRULE:FREQ=YEARLY;UNTIL=19460413T220000Z;BYDAY=SA;BYMONTHDAY=13,14,15,16,1
+ 7,18,19;BYMONTH=4
+TZNAME:WEMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19740413T230000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=13,14,15,16,17,18,19;BYDAY=SA;UNTIL=19750419T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460930T000000
+RDATE:19460930T000000
+TZNAME:CEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19741006T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19751004T230000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19760926T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19770924T230000Z
-END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
+DTSTART:19490430T230000
+RDATE:19490430T230000
+RDATE:19760327T230000
 TZNAME:CEST
-DTSTART:19770402T230000
-RRULE:FREQ=YEARLY;UNTIL=19780402T220000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19790401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19490930T010000
+RDATE:19490930T010000
+RDATE:19781001T010000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740413T230000
+RRULE:FREQ=YEARLY;UNTIL=19750419T220000Z;BYDAY=SA;BYMONTHDAY=13,14,15,16,1
+ 7,18,19;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741006T010000
+RRULE:FREQ=YEARLY;UNTIL=19751004T230000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-001444
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19010101T000000
-RDATE:19010101T000000
+DTSTART:19760926T010000
+RRULE:FREQ=YEARLY;UNTIL=19770924T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19170505T230000
-RDATE:19170505T230000
-RDATE:19180415T230000
-RDATE:19190405T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19370522T230000
-RDATE:19380322T230000
-RDATE:19390415T230000
-RDATE:19400316T230000
+DTSTART:19770402T230000
+RRULE:FREQ=YEARLY;UNTIL=19780402T220000Z;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790101T000000
+RDATE:19790101T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19241005T000000
-RDATE:19241005T000000
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790401T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:WEMT
-DTSTART:19420502T230000
-RDATE:19420502T230000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19420902T000000
-RDATE:19420902T000000
-RDATE:19431004T000000
-RDATE:19441011T000000
-RDATE:19450930T010000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19460930T000000
-RDATE:19460930T000000
-RDATE:19490930T010000
-RDATE:19781001T010000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19490430T230000
-RDATE:19490430T230000
-RDATE:19760327T230000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790101T000000
-RDATE:19790101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Malta.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Malta.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Malta.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,83 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Malta
 X-LIC-LOCATION:Europe/Malta
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19181006T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19191004T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
+DTSTART:18931102T000000
+RDATE:18931102T000000
 TZNAME:CEST
-DTSTART:19660522T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19680525T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19660925T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=4SU;UNTIL=19690927T220000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19710523T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19720527T230000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19750420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3SU;UNTIL=19790415T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19750921T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19800921T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19810927T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+005804
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18931102T000000
-RDATE:18931102T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160603T000000
 RDATE:19160603T000000
 RDATE:19170401T000000
@@ -96,11 +31,11 @@
 RDATE:19730331T000000
 RDATE:19740421T000000
 RDATE:19800331T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19170930T010000
@@ -117,13 +52,79 @@
 RDATE:19721001T000000
 RDATE:19730929T010000
 RDATE:19740916T010000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19181006T010000
+RRULE:FREQ=YEARLY;UNTIL=19191004T230000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19660522T000000
+RRULE:FREQ=YEARLY;UNTIL=19680525T230000Z;BYDAY=4SU;BYMONTH=5
+TZNAME:CEST
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19660925T000000
+RRULE:FREQ=YEARLY;UNTIL=19690927T220000Z;BYDAY=4SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19710523T000000
+RRULE:FREQ=YEARLY;UNTIL=19720527T230000Z;BYDAY=4SU;BYMONTH=5
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19750420T020000
+RRULE:FREQ=YEARLY;UNTIL=19790415T010000Z;BYDAY=3SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19750921T020000
+RRULE:FREQ=YEARLY;UNTIL=19800921T000000Z;BYDAY=3SU;BYMONTH=9
 TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19810101T000000
 RDATE:19810101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Mariehamn.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Mariehamn.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Mariehamn.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,79 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Mariehamn
 X-LIC-LOCATION:Europe/Mariehamn
+BEGIN:STANDARD
+DTSTART:18780531T000000
+RDATE:18780531T000000
+TZNAME:HMT
+TZOFFSETFROM:+013952
+TZOFFSETTO:+013952
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19210501T000000
+RDATE:19210501T000000
+TZNAME:EEST
+TZOFFSETFROM:+013952
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420403T000000
+RDATE:19420403T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19810329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421003T000000
+RDATE:19421003T000000
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19810927T040000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;UNTIL=19820328T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;UNTIL=19820926T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+013952
-TZOFFSETTO:+013952
-TZNAME:HMT
-DTSTART:18780531T000000
-RDATE:18780531T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+013952
+DTSTART:19830101T000000
+RDATE:19830101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19210501T000000
-RDATE:19210501T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830327T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19420403T000000
-RDATE:19420403T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830925T040000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19421003T000000
-RDATE:19421003T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19961027T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19810329T020000
-RDATE:19810329T020000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Minsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Minsk.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Minsk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,131 +1,144 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Minsk
 X-LIC-LOCATION:Europe/Minsk
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19890325T230000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T000000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
 TZOFFSETFROM:+015016
 TZOFFSETTO:+0150
-TZNAME:MMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:EET
 TZOFFSETFROM:+0150
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19240502T000000
-RDATE:19240502T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:MSK
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19440703T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19410628T000000
+RDATE:19410628T000000
+TZNAME:CEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410628T000000
-RDATE:19410628T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19431004T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19430329T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19440703T000000
+RDATE:19440703T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19900101T000000
-RDATE:19900101T000000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19890923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19890325T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900101T000000
+RDATE:19900101T000000
+TZNAME:MSK
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:EEST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
-END:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910929T030000
-RDATE:19910929T030000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920329T000000
+RDATE:19920329T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920927T010000
 RDATE:19920927T010000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19920329T000000
-RDATE:19920329T000000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Monaco.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Monaco.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Monaco.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,69 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Monaco
 X-LIC-LOCATION:Europe/Monaco
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19161002T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19191005T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19221008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381001T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19770403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18910315T000000
+RDATE:18910315T000000
+TZNAME:PMT
 TZOFFSETFROM:+002932
 TZOFFSETTO:+000921
-TZNAME:PMT
-DTSTART:18910315T000000
-RDATE:18910315T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110311T000000
+RDATE:19110311T000000
+TZNAME:WEST
 TZOFFSETFROM:+000921
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19110311T000000
-RDATE:19110311T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:WEST
 DTSTART:19160614T230000
 RDATE:19160614T230000
 RDATE:19170324T230000
@@ -90,60 +46,113 @@
 RDATE:19380326T230000
 RDATE:19390415T230000
 RDATE:19400225T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19161002T000000
+RRULE:FREQ=YEARLY;UNTIL=19191005T230000Z;BYDAY=MO;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19201024T000000
 RDATE:19201024T000000
 RDATE:19211026T000000
 RDATE:19391119T000000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19221008T000000
+RRULE:FREQ=YEARLY;UNTIL=19381001T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:WEMT
 DTSTART:19410505T000000
 RDATE:19410505T000000
 RDATE:19420309T000000
 RDATE:19430329T020000
 RDATE:19440403T020000
 RDATE:19450402T020000
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:WEST
 DTSTART:19411006T000000
 RDATE:19411006T000000
 RDATE:19421102T030000
 RDATE:19431004T030000
 RDATE:19441008T010000
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450916T030000
+RDATE:19450916T030000
+TZNAME:CEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19450916T030000
-RDATE:19450916T030000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760328T010000
+RDATE:19760328T010000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19760926T010000
 RDATE:19760926T010000
 RDATE:19770925T030000
 RDATE:19781001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19770101T000000
+RDATE:19770101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:CEST
-DTSTART:19760328T010000
-RDATE:19760328T010000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19770101T000000
-RDATE:19770101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Moscow.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Moscow.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Moscow.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,167 +1,168 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Moscow
 X-LIC-LOCATION:Europe/Moscow
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
 TZOFFSETFROM:+023020
 TZOFFSETTO:+0230
-TZNAME:MMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19160703T000000
+RDATE:19160703T000000
+TZNAME:S
 TZOFFSETFROM:+0230
 TZOFFSETTO:+023048
-TZNAME:MMT
-DTSTART:19160703T000000
-RDATE:19160703T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170701T230000
+RDATE:19170701T230000
+TZNAME:MST
 TZOFFSETFROM:+023048
 TZOFFSETTO:+033048
-TZNAME:MST
-DTSTART:19170701T230000
-RDATE:19170701T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19171228T000000
+RDATE:19171228T000000
+TZNAME:MMT
 TZOFFSETFROM:+033048
 TZOFFSETTO:+023048
-TZNAME:MMT
-DTSTART:19171228T000000
-RDATE:19171228T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180531T220000
+RDATE:19180531T220000
+TZNAME:MDST
 TZOFFSETFROM:+023048
 TZOFFSETTO:+043048
-TZNAME:MDST
-DTSTART:19180531T220000
-RDATE:19180531T220000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19180916T010000
+RDATE:19180916T010000
+TZNAME:MST
 TZOFFSETFROM:+043048
 TZOFFSETTO:+033048
-TZNAME:MST
-DTSTART:19180916T010000
-RDATE:19180916T010000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19190531T230000
+RDATE:19190531T230000
+TZNAME:MDST
 TZOFFSETFROM:+033048
 TZOFFSETTO:+043048
-TZNAME:MDST
-DTSTART:19190531T230000
-RDATE:19190531T230000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19190701T020000
+RDATE:19190701T020000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+043048
 TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19190701T020000
-RDATE:19190701T020000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
 DTSTART:19190816T000000
 RDATE:19190816T000000
 RDATE:19211001T000000
 RDATE:19920926T230000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
 DTSTART:19210214T230000
 RDATE:19210214T230000
 RDATE:19920328T230000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19210320T230000
+RDATE:19210320T230000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:MSD
-DTSTART:19210320T230000
-RDATE:19210320T230000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19210901T000000
+RDATE:19210901T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19210901T000000
-RDATE:19210901T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19221001T000000
 RDATE:19221001T000000
 RDATE:19910929T030000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:MSK
 DTSTART:19300621T000000
 RDATE:19300621T000000
 RDATE:19920119T020000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:EEST
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Nicosia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Nicosia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Nicosia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,75 +1,76 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Nicosia
 X-LIC-LOCATION:Europe/Nicosia
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
+BEGIN:STANDARD
+DTSTART:19211114T000000
+RDATE:19211114T000000
 TZNAME:EEST
-DTSTART:19770403T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800405T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+021328
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19790930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19970927T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19750413T000000
+RDATE:19750413T000000
+RDATE:19760515T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19810329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980328T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19751012T000000
+RDATE:19751012T000000
+RDATE:19761011T000000
+RDATE:19770925T000000
+RDATE:19781002T000000
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19981025T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19770403T000000
+RRULE:FREQ=YEARLY;UNTIL=19800405T220000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19990328T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+021328
+DTSTART:19790930T000000
+RRULE:FREQ=YEARLY;UNTIL=19970927T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19211114T000000
-RDATE:19211114T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T000000
+RRULE:FREQ=YEARLY;UNTIL=19980328T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19750413T000000
-RDATE:19750413T000000
-RDATE:19760515T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19980901T000000
+RDATE:19980901T000000
+TZNAME:EEST
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19981025T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19751012T000000
-RDATE:19751012T000000
-RDATE:19761011T000000
-RDATE:19770925T000000
-RDATE:19781002T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
+DTSTART:19990328T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19980901T000000
-RDATE:19980901T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Oslo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Oslo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Oslo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,81 +1,88 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Oslo
 X-LIC-LOCATION:Europe/Oslo
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0043
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160522T010000
+RDATE:19160522T010000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19650425T020000
+RDATE:19800406T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19590315T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19640315T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19160930T000000
+RDATE:19160930T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451001T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19590920T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3SU;UNTIL=19650919T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
+DTSTART:19400810T230000
+RDATE:19400810T230000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19590315T020000
+RRULE:FREQ=YEARLY;UNTIL=19640315T010000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19590920T030000
+RRULE:FREQ=YEARLY;UNTIL=19650919T010000Z;BYDAY=3SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0043
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
-DTSTART:18950101T000000
-RDATE:18950101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19160522T010000
-RDATE:19160522T010000
-RDATE:19400810T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19650425T020000
-RDATE:19800406T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19160930T000000
-RDATE:19160930T000000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451001T030000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800101T000000
-RDATE:19800101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Paris.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Paris.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Paris.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,69 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Paris
 X-LIC-LOCATION:Europe/Paris
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19161002T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=MO;UNTIL=19191005T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19221008T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381001T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19770403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18910315T000100
+RDATE:18910315T000100
+TZNAME:PMT
 TZOFFSETFROM:+000921
 TZOFFSETTO:+000921
-TZNAME:PMT
-DTSTART:18910315T000100
-RDATE:18910315T000100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:WEST
 TZOFFSETFROM:+000921
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19110311T000100
-RDATE:19110311T000100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:WEST
 DTSTART:19160614T230000
 RDATE:19160614T230000
 RDATE:19170324T230000
@@ -90,65 +46,124 @@
 RDATE:19380326T230000
 RDATE:19390415T230000
 RDATE:19400225T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19161002T000000
+RRULE:FREQ=YEARLY;UNTIL=19191005T230000Z;BYDAY=MO;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19201024T000000
 RDATE:19201024T000000
 RDATE:19211026T000000
 RDATE:19391119T000000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19221008T000000
+RRULE:FREQ=YEARLY;UNTIL=19381001T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19400614T230000
 RDATE:19400614T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19760328T010000
-END:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19431004T030000
-RDATE:19450916T030000
 RDATE:19760926T010000
 RDATE:19770925T030000
 RDATE:19781001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19760328T010000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:WEMT
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19440825T000000
 RDATE:19440825T000000
-END:DAYLIGHT
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19441008T010000
+RDATE:19441008T010000
+TZNAME:WEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19441008T010000
-RDATE:19441008T010000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450402T020000
+RDATE:19450402T020000
+TZNAME:WEMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:WEMT
-DTSTART:19450402T020000
-RDATE:19450402T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19450916T030000
+RDATE:19450916T030000
+TZNAME:CEST
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19770101T000000
 RDATE:19770101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Podgorica.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Podgorica.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Podgorica.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,77 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Podgorica
 X-LIC-LOCATION:Europe/Podgorica
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:CET
+TZOFFSETFROM:+0122
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410418T230000
+RDATE:19410418T230000
+RDATE:19450508T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19830925T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0122
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410418T230000
-RDATE:19410418T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450508T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830925T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19450101T000000
-RDATE:19450101T000000
-RDATE:19821127T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Prague.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Prague.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Prague.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,104 +1,111 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Prague
 X-LIC-LOCATION:Europe/Prague
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
+DTSTART:18500101T000000
+RDATE:18500101T000000
+TZNAME:PMT
+TZOFFSETFROM:+005744
+TZOFFSETTO:+005744
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:18911001T000000
+RDATE:18911001T000000
+TZNAME:CEST
+TZOFFSETFROM:+005744
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19461006T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450408T020000
+RDATE:19460506T020000
+RDATE:19470420T020000
+RDATE:19480418T020000
+RDATE:19490409T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19790401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19451118T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+005744
-TZOFFSETTO:+005744
-TZNAME:PMT
-DTSTART:18500101T000000
-RDATE:18500101T000000
+DTSTART:19440917T030000
+RDATE:19440917T030000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+005744
+DTSTART:19461006T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18911001T000000
-RDATE:18911001T000000
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790101T000000
+RDATE:19790101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790401T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19160430T230000
-RDATE:19160430T230000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450408T020000
-RDATE:19460506T020000
-RDATE:19470420T020000
-RDATE:19480418T020000
-RDATE:19490409T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19440917T030000
-RDATE:19451118T030000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790101T000000
-RDATE:19790101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Riga.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Riga.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Riga.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,162 +1,169 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Riga
 X-LIC-LOCATION:Europe/Riga
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19890924T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19960929T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19900325T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960331T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19970330T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19990328T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19971026T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991031T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:20010325T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20011028T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:RMT
 TZOFFSETFROM:+013624
 TZOFFSETTO:+013624
-TZNAME:RMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+013624
-TZOFFSETTO:+023624
-TZNAME:LST
+BEGIN:STANDARD
 DTSTART:19180415T020000
 RDATE:19180415T020000
 RDATE:19190401T020000
-END:DAYLIGHT
+TZNAME:LST
+TZOFFSETFROM:+013624
+TZOFFSETTO:+023624
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+023624
-TZOFFSETTO:+013624
-TZNAME:RMT
 DTSTART:19180916T030000
 RDATE:19180916T030000
 RDATE:19190522T030000
+TZNAME:RMT
+TZOFFSETFROM:+023624
+TZOFFSETTO:+013624
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19260511T000000
+RDATE:19260511T000000
+TZNAME:EET
 TZOFFSETFROM:+013624
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19260511T000000
-RDATE:19260511T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19400805T000000
+RDATE:19400805T000000
+TZNAME:MSK
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19400805T000000
-RDATE:19400805T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19410701T000000
+RDATE:19410701T000000
+TZNAME:CEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410701T000000
-RDATE:19410701T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19431004T030000
 RDATE:19441002T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19430329T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19441013T000000
+RDATE:19441013T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19441013T000000
-RDATE:19441013T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:EEST
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19880924T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19880326T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19890326T020000
 RDATE:19890326T020000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;UNTIL=19960929T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19900325T020000
+RRULE:FREQ=YEARLY;UNTIL=19960331T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19970121T000000
+RDATE:19970121T000000
+RDATE:20010102T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T030000
+RRULE:FREQ=YEARLY;UNTIL=19990328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19971026T040000
+RRULE:FREQ=YEARLY;UNTIL=19991031T010000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EET
-DTSTART:19970121T000000
-RDATE:19970121T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000229T000000
 RDATE:20000229T000000
-RDATE:20010102T000000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010325T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20011028T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Rome.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Rome.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Rome.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,97 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Rome
 X-LIC-LOCATION:Europe/Rome
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19181006T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19191004T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19660522T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19680525T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19660925T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=4SU;UNTIL=19690927T220000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19710523T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19720527T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19730930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19740928T220000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19750928T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19770924T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19770522T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19790526T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18660922T000000
+RDATE:18660922T000000
+TZNAME:RMT
 TZOFFSETFROM:+004956
 TZOFFSETTO:+004956
-TZNAME:RMT
-DTSTART:18660922T000000
-RDATE:18660922T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18931101T000000
+RDATE:18931101T000000
+TZNAME:CEST
 TZOFFSETFROM:+004956
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18931101T000000
-RDATE:18931101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160603T000000
 RDATE:19160603T000000
 RDATE:19170401T000000
@@ -112,11 +40,11 @@
 RDATE:19750601T000000
 RDATE:19760530T000000
 RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19170930T010000
@@ -133,20 +61,93 @@
 RDATE:19721001T000000
 RDATE:19781001T010000
 RDATE:19790930T010000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181006T010000
+RRULE:FREQ=YEARLY;UNTIL=19191004T230000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19440701T000000
+RDATE:19440701T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19660522T000000
+RRULE:FREQ=YEARLY;UNTIL=19680525T230000Z;BYDAY=4SU;BYMONTH=5
 TZNAME:CEST
-DTSTART:19440701T000000
-RDATE:19440701T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19660925T000000
+RRULE:FREQ=YEARLY;UNTIL=19690927T220000Z;BYDAY=4SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19710523T000000
+RRULE:FREQ=YEARLY;UNTIL=19720527T230000Z;BYDAY=4SU;BYMONTH=5
+TZNAME:CEST
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730930T000000
+RRULE:FREQ=YEARLY;UNTIL=19740928T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19750928T010000
+RRULE:FREQ=YEARLY;UNTIL=19770924T230000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770522T000000
+RRULE:FREQ=YEARLY;UNTIL=19790526T230000Z;BYDAY=4SU;BYMONTH=5
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19800101T000000
 RDATE:19800101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Samara.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Samara.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Samara.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,128 +1,150 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Samara
 X-LIC-LOCATION:Europe/Samara
+BEGIN:STANDARD
+DTSTART:19190701T020000
+RDATE:19190701T020000
+TZNAME:SAMT
+TZOFFSETFROM:+032036
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:SAMT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19350127T000000
+RDATE:19350127T000000
+RDATE:19890326T020000
+TZNAME:KUYST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
+TZNAME:KUYST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:KUYST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:KUYT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:KUYT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19880924T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KUYT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:KUYT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T220000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19880326T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:KUYST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:KUYST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KUYT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19900325T020000
+RDATE:19900325T020000
+TZNAME:KUYST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:KUYST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
 TZNAME:KUYT
-DTSTART:19890924T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19911020T030000
+RDATE:19911020T030000
+TZNAME:SAMST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:SAMST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:SAMST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:SAMT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:SAMT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T220000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20090328T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:SAMST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:SAMT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:SAMT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+032036
-TZOFFSETTO:+0300
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20091024T220000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:SAMT
-DTSTART:19190701T020000
-RDATE:19190701T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
+TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:SAMT
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19911020T030000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:20100328T020000
+RDATE:20100328T020000
+TZNAME:SAMST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:KUYT
-DTSTART:19350127T000000
-RDATE:19350127T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20101031T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:SAMT
 TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-TZNAME:KUYST
-DTSTART:19890326T020000
-RDATE:19890326T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:KUYST
-DTSTART:19900325T020000
-RDATE:19900325T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
-TZNAME:KUYST
-DTSTART:19910331T020000
-RDATE:19910331T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:KUYT
-DTSTART:19910929T030000
-RDATE:19910929T030000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
+DTSTART:20110327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:SAMST
-DTSTART:19920328T230000
-RDATE:19920328T230000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:SAMT
-DTSTART:19920926T230000
-RDATE:19920926T230000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/San_Marino.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/San_Marino.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/San_Marino.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,97 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/San_Marino
 X-LIC-LOCATION:Europe/San_Marino
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19181006T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19191004T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19660522T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19680525T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19660925T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=4SU;UNTIL=19690927T220000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19710523T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19720527T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19730930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19740928T220000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19750928T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19770924T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19770522T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19790526T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18660922T000000
+RDATE:18660922T000000
+TZNAME:RMT
 TZOFFSETFROM:+004956
 TZOFFSETTO:+004956
-TZNAME:RMT
-DTSTART:18660922T000000
-RDATE:18660922T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18931101T000000
+RDATE:18931101T000000
+TZNAME:CEST
 TZOFFSETFROM:+004956
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18931101T000000
-RDATE:18931101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160603T000000
 RDATE:19160603T000000
 RDATE:19170401T000000
@@ -112,11 +40,11 @@
 RDATE:19750601T000000
 RDATE:19760530T000000
 RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19170930T010000
@@ -133,20 +61,93 @@
 RDATE:19721001T000000
 RDATE:19781001T010000
 RDATE:19790930T010000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181006T010000
+RRULE:FREQ=YEARLY;UNTIL=19191004T230000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19440701T000000
+RDATE:19440701T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19660522T000000
+RRULE:FREQ=YEARLY;UNTIL=19680525T230000Z;BYDAY=4SU;BYMONTH=5
 TZNAME:CEST
-DTSTART:19440701T000000
-RDATE:19440701T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19660925T000000
+RRULE:FREQ=YEARLY;UNTIL=19690927T220000Z;BYDAY=4SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19710523T000000
+RRULE:FREQ=YEARLY;UNTIL=19720527T230000Z;BYDAY=4SU;BYMONTH=5
+TZNAME:CEST
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730930T000000
+RRULE:FREQ=YEARLY;UNTIL=19740928T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19750928T010000
+RRULE:FREQ=YEARLY;UNTIL=19770924T230000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770522T000000
+RRULE:FREQ=YEARLY;UNTIL=19790526T230000Z;BYDAY=4SU;BYMONTH=5
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19800101T000000
 RDATE:19800101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sarajevo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sarajevo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sarajevo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,77 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Sarajevo
 X-LIC-LOCATION:Europe/Sarajevo
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:CET
+TZOFFSETFROM:+0122
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410418T230000
+RDATE:19410418T230000
+RDATE:19450508T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19830925T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0122
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410418T230000
-RDATE:19410418T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450508T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830925T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19450101T000000
-RDATE:19450101T000000
-RDATE:19821127T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Simferopol.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Simferopol.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Simferopol.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,173 +1,180 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Simferopol
 X-LIC-LOCATION:Europe/Simferopol
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:SMT
+TZOFFSETFROM:+021624
+TZOFFSETTO:+0216
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:EET
+TZOFFSETFROM:+0216
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:MSK
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
+DTSTART:19411101T000000
+RDATE:19411101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19440413T000000
+RDATE:19440413T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19890325T230000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19920329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19920927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19930925T210000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19890923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19940925T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T200000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19890325T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19950326T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T210000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19900101T000000
+RDATE:19900101T000000
+RDATE:19970101T000000
+TZNAME:MSK
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19971026T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19980329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+021624
-TZOFFSETTO:+0216
-TZNAME:SMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0216
+DTSTART:19900701T020000
+RDATE:19900701T020000
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19240502T000000
-RDATE:19240502T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19440413T000000
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19411101T000000
-RDATE:19411101T000000
-END:DAYLIGHT
-BEGIN:STANDARD
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;UNTIL=19940326T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19430329T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;UNTIL=19930925T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19900101T000000
-RDATE:19900101T000000
-RDATE:19970101T000000
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19940501T000000
+RDATE:19940501T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19900701T020000
-RDATE:19900701T020000
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19920101T000000
-RDATE:19920101T000000
+DTSTART:19940925T000000
+RRULE:FREQ=YEARLY;UNTIL=19950923T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19950326T000000
+RRULE:FREQ=YEARLY;UNTIL=19960330T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19960331T040000
+RDATE:19960331T040000
 TZNAME:MSD
-DTSTART:19940501T000000
-RDATE:19940501T000000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19960331T040000
-RDATE:19960331T040000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19961027T040000
+RDATE:19961027T040000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19961027T040000
-RDATE:19961027T040000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19970330T040000
+RDATE:19970330T040000
+TZNAME:EEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19971026T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19980329T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:EEST
-DTSTART:19970330T040000
-RDATE:19970330T040000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Skopje.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Skopje.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Skopje.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,77 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Skopje
 X-LIC-LOCATION:Europe/Skopje
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:CET
+TZOFFSETFROM:+0122
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410418T230000
+RDATE:19410418T230000
+RDATE:19450508T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19830925T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0122
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410418T230000
-RDATE:19410418T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450508T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830925T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19450101T000000
-RDATE:19450101T000000
-RDATE:19821127T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sofia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sofia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sofia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,134 +1,135 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Sofia
 X-LIC-LOCATION:Europe/Sofia
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19800405T230000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SA;UNTIL=19820403T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19820926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900930T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900325T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19910331T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910929T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19970330T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19971026T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:IMT
 TZOFFSETFROM:+013316
 TZOFFSETTO:+015656
-TZNAME:IMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18941130T000000
+RDATE:18941130T000000
+TZNAME:EET
 TZOFFSETFROM:+015656
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:18941130T000000
-RDATE:18941130T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19421102T020000
-RDATE:19421102T020000
-RDATE:19431004T030000
-RDATE:19441002T030000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19430329T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19450101T000000
-RDATE:19450101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450402T030000
+RDATE:19450402T030000
+TZNAME:EET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19450402T030000
-RDATE:19450402T030000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790331T230000
+RDATE:19790331T230000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19790331T230000
-RDATE:19790331T230000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19791001T010000
 RDATE:19791001T010000
 RDATE:19800929T010000
 RDATE:19810927T020000
 RDATE:19961027T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19800405T230000
+RRULE:FREQ=YEARLY;UNTIL=19820403T210000Z;BYDAY=1SA;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19820926T020000
+RDATE:19820926T020000
+TZNAME:EEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820926T030000
+RRULE:FREQ=YEARLY;UNTIL=19900930T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;UNTIL=19900325T000000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EEST
-DTSTART:19820926T020000
-RDATE:19820926T020000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19910101T000000
 RDATE:19910101T000000
 RDATE:19970101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19910331T000000
+RRULE:FREQ=YEARLY;UNTIL=19960330T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910929T000000
+RRULE:FREQ=YEARLY;UNTIL=19950923T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19971026T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Stockholm.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Stockholm.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Stockholm.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,65 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Stockholm
 X-LIC-LOCATION:Europe/Stockholm
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:18790101T000000
+RDATE:18790101T000000
+TZNAME:SET
+TZOFFSETFROM:+011212
+TZOFFSETTO:+010014
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19000101T000000
+RDATE:19000101T000000
+TZNAME:CET
+TZOFFSETFROM:+010014
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19160514T230000
+RDATE:19160514T230000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+011212
-TZOFFSETTO:+010014
-TZNAME:SET
-DTSTART:18790101T000000
-RDATE:18790101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+010014
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19000101T000000
-RDATE:19000101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19800406T020000
+RDATE:19800406T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19160514T230000
-RDATE:19160514T230000
-RDATE:19800406T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19161001T010000
-RDATE:19161001T010000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800101T000000
-RDATE:19800101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tallinn.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tallinn.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tallinn.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,162 +1,175 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Tallinn
 X-LIC-LOCATION:Europe/Tallinn
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19890924T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19900325T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19980329T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T000000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19981025T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19991031T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:20020331T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20021027T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:TMT
 TZOFFSETFROM:+0139
 TZOFFSETTO:+0139
-TZNAME:TMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19180201T000000
+RDATE:19180201T000000
+TZNAME:CEST
 TZOFFSETFROM:+0139
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19180201T000000
-RDATE:19180201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19180415T020000
 RDATE:19180415T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19180916T030000
 RDATE:19180916T030000
 RDATE:19421102T030000
 RDATE:19431004T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19190701T000000
+RDATE:19190701T000000
+TZNAME:TMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0139
-TZNAME:TMT
-DTSTART:19190701T000000
-RDATE:19190701T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19210501T000000
+RDATE:19210501T000000
+TZNAME:EET
 TZOFFSETFROM:+0139
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19210501T000000
-RDATE:19210501T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19400806T000000
+RDATE:19400806T000000
+TZNAME:MSK
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19400806T000000
-RDATE:19400806T000000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410915T000000
+RDATE:19410915T000000
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19440922T000000
 RDATE:19440922T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410915T000000
-RDATE:19410915T000000
+TZOFFSETTO:+0400
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19880924T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19880326T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:EEST
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19890326T020000
 RDATE:19890326T020000
 RDATE:19980922T000000
-END:DAYLIGHT
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19900325T020000
+RRULE:FREQ=YEARLY;UNTIL=19980329T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=19971026T000000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19981025T040000
+RRULE:FREQ=YEARLY;UNTIL=19991031T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19990328T030000
 RDATE:19990328T030000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19991101T000000
+RDATE:19991101T000000
+TZNAME:EET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19991101T000000
-RDATE:19991101T000000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20020221T000000
 RDATE:20020221T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020331T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tirane.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tirane.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tirane.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,48 +1,18 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Tirane
 X-LIC-LOCATION:Europe/Tirane
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
+DTSTART:19140101T000000
+RDATE:19140101T000000
 TZNAME:CET
-DTSTART:19741002T000000
-RRULE:FREQ=YEARLY;UNTIL=19751001T220000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+011920
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19140101T000000
-RDATE:19140101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19400616T000000
 RDATE:19400616T000000
 RDATE:19430329T020000
@@ -57,14 +27,16 @@
 RDATE:19820502T000000
 RDATE:19830418T000000
 RDATE:19840401T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19430410T030000
+RDATE:19741002T000000
+RDATE:19751002T000000
 RDATE:19761003T000000
 RDATE:19771002T000000
 RDATE:19781001T000000
@@ -73,13 +45,37 @@
 RDATE:19810927T000000
 RDATE:19821003T000000
 RDATE:19831001T000000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840701T000000
+RDATE:19840701T000000
+TZNAME:CEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:CEST
-DTSTART:19840701T000000
-RDATE:19840701T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tiraspol.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tiraspol.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tiraspol.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,168 +1,171 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Tiraspol
 X-LIC-LOCATION:Europe/Tiraspol
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19321002T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19390930T220000Z
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:CMT
+TZOFFSETFROM:+015520
+TZOFFSETTO:+0155
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19330402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19390401T220000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
+DTSTART:19180215T000000
+RDATE:19180215T000000
+TZNAME:BMT
+TZOFFSETFROM:+0155
+TZOFFSETTO:+014424
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19890325T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19310724T000000
+RDATE:19310724T000000
+TZNAME:EEST
+TZOFFSETFROM:+014424
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910101T000000
-RRULE:FREQ=YEARLY;UNTIL=19911231T220000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19320521T000000
+RDATE:19320521T000000
+RDATE:19910331T020000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19920329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960330T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19321002T010000
+RRULE:FREQ=YEARLY;UNTIL=19390930T220000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19920927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T210000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19330402T000000
+RRULE:FREQ=YEARLY;UNTIL=19390401T220000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19970330T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19971026T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19400815T000000
+RDATE:19400815T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+015520
-TZOFFSETTO:+0155
-TZNAME:CMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0155
-TZOFFSETTO:+014424
-TZNAME:BMT
-DTSTART:19180215T000000
-RDATE:19180215T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+014424
+DTSTART:19410717T000000
+RDATE:19410717T000000
+TZNAME:CEST
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19310724T000000
-RDATE:19310724T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19320521T000000
-RDATE:19320521T000000
-RDATE:19400815T000000
-RDATE:19910331T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410717T000000
-RDATE:19410717T000000
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19431004T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19430329T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19440824T000000
+RDATE:19440824T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19440824T000000
-RDATE:19440824T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19890923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19890325T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:MSK
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900101T000000
 RDATE:19900101T000000
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19900506T000000
 RDATE:19900506T000000
 RDATE:19910929T030000
 RDATE:19961027T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+RDATE:19920101T000000
+RDATE:19970101T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;UNTIL=19960330T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;UNTIL=19950923T210000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:EET
-DTSTART:19970101T000000
-RDATE:19970101T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19971026T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Uzhgorod.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Uzhgorod.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Uzhgorod.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,146 +1,147 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Uzhgorod
 X-LIC-LOCATION:Europe/Uzhgorod
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19890923T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19890325T230000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19920329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19920927T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19940924T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19950326T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18901001T000000
+RDATE:18901001T000000
+TZNAME:CET
 TZOFFSETFROM:+012912
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18901001T000000
-RDATE:18901001T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19400101T000000
+RDATE:19400101T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19400101T000000
-RDATE:19400101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19400401T020000
 RDATE:19400401T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19431004T030000
 RDATE:19441026T000000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19441001T000000
+RDATE:19441001T000000
+TZNAME:CEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19441001T000000
-RDATE:19441001T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450629T000000
+RDATE:19450629T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19450629T000000
-RDATE:19450629T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19890923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19890325T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:MSK
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19900101T000000
 RDATE:19900101T000000
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19900701T020000
+RDATE:19900701T020000
+TZNAME:CET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19900701T020000
-RDATE:19900701T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19910331T030000
+RDATE:19910331T030000
+TZNAME:EET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910331T030000
-RDATE:19910331T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19920101T000000
 RDATE:19920101T000000
 RDATE:19950101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;UNTIL=19940326T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;UNTIL=19940924T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19950924T040000
 RDATE:19950924T040000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vaduz.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vaduz.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vaduz.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Vaduz
 X-LIC-LOCATION:Europe/Vaduz
+BEGIN:STANDARD
+DTSTART:18940601T000000
+RDATE:18940601T000000
+TZNAME:CET
+TZOFFSETFROM:+003804
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810101T000000
+RDATE:19810101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19810927T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+003804
-TZOFFSETTO:+0100
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:CET
-DTSTART:18940601T000000
-RDATE:18940601T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19810101T000000
-RDATE:19810101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vatican.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vatican.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vatican.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,97 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Vatican
 X-LIC-LOCATION:Europe/Vatican
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19181006T010000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19191004T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19660522T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19680525T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19660925T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=4SU;UNTIL=19690927T220000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19710523T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19720527T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19730930T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19740928T220000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19750928T010000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19770924T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19770522T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=4SU;UNTIL=19790526T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18660922T000000
+RDATE:18660922T000000
+TZNAME:RMT
 TZOFFSETFROM:+004956
 TZOFFSETTO:+004956
-TZNAME:RMT
-DTSTART:18660922T000000
-RDATE:18660922T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18931101T000000
+RDATE:18931101T000000
+TZNAME:CEST
 TZOFFSETFROM:+004956
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18931101T000000
-RDATE:18931101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160603T000000
 RDATE:19160603T000000
 RDATE:19170401T000000
@@ -112,11 +40,11 @@
 RDATE:19750601T000000
 RDATE:19760530T000000
 RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19170930T010000
@@ -133,20 +61,93 @@
 RDATE:19721001T000000
 RDATE:19781001T010000
 RDATE:19790930T010000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181006T010000
+RRULE:FREQ=YEARLY;UNTIL=19191004T230000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19440701T000000
+RDATE:19440701T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19660522T000000
+RRULE:FREQ=YEARLY;UNTIL=19680525T230000Z;BYDAY=4SU;BYMONTH=5
 TZNAME:CEST
-DTSTART:19440701T000000
-RDATE:19440701T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19660925T000000
+RRULE:FREQ=YEARLY;UNTIL=19690927T220000Z;BYDAY=4SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19710523T000000
+RRULE:FREQ=YEARLY;UNTIL=19720527T230000Z;BYDAY=4SU;BYMONTH=5
+TZNAME:CEST
 TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730930T000000
+RRULE:FREQ=YEARLY;UNTIL=19740928T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19750928T010000
+RRULE:FREQ=YEARLY;UNTIL=19770924T230000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770522T000000
+RRULE:FREQ=YEARLY;UNTIL=19790526T230000Z;BYDAY=4SU;BYMONTH=5
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19800101T000000
 RDATE:19800101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vienna.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vienna.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vienna.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,78 +1,33 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Vienna
 X-LIC-LOCATION:Europe/Vienna
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19461006T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19481003T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
+DTSTART:18930401T000000
+RDATE:18930401T000000
 TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19810927T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+010520
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18930401T000000
-RDATE:18930401T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19160430T230000
 RDATE:19160430T230000
 RDATE:19200405T020000
 RDATE:19400401T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
-RDATE:19450402T020000
 RDATE:19460414T020000
 RDATE:19470406T020000
 RDATE:19480418T020000
 RDATE:19800406T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19161001T010000
 RDATE:19161001T010000
 RDATE:19200913T030000
@@ -81,15 +36,67 @@
 RDATE:19441002T030000
 RDATE:19450412T030000
 RDATE:19800928T000000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19200101T000000
 RDATE:19200101T000000
 RDATE:19460101T000000
 RDATE:19810101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450402T020000
+RDATE:19450402T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19461006T030000
+RRULE:FREQ=YEARLY;UNTIL=19481003T010000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vilnius.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vilnius.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vilnius.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,162 +1,175 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Vilnius
 X-LIC-LOCATION:Europe/Vilnius
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910929T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19920329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19970330T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19971026T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:20030330T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20031026T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:WMT
 TZOFFSETFROM:+014116
 TZOFFSETTO:+0124
-TZNAME:WMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19170101T000000
+RDATE:19170101T000000
+TZNAME:KMT
 TZOFFSETFROM:+0124
 TZOFFSETTO:+013536
-TZNAME:KMT
-DTSTART:19170101T000000
-RDATE:19170101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19191010T000000
+RDATE:19191010T000000
+TZNAME:CET
 TZOFFSETFROM:+013536
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19191010T000000
-RDATE:19191010T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19200712T000000
+RDATE:19200712T000000
+TZNAME:EET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19200712T000000
-RDATE:19200712T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19201009T000000
 RDATE:19201009T000000
 RDATE:19421102T030000
 RDATE:19431004T030000
 RDATE:19981025T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19400803T000000
+RDATE:19400803T000000
+TZNAME:MSK
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19400803T000000
-RDATE:19400803T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19410624T000000
+RDATE:19410624T000000
+TZNAME:CEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410624T000000
-RDATE:19410624T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
 DTSTART:19430329T020000
 RDATE:19430329T020000
 RDATE:19440403T020000
-RDATE:19990328T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19440801T000000
+RDATE:19440801T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19440801T000000
-RDATE:19440801T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:EEST
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920329T020000
+RRULE:FREQ=YEARLY;UNTIL=19970330T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=19971026T000000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19980101T000000
 RDATE:19980101T000000
 RDATE:19991031T030000
-RDATE:20030101T000000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19980329T030000
+RDATE:19980329T030000
+TZNAME:CEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19990328T020000
+RRULE:FREQ=YEARLY;UNTIL=19990328T010000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:CEST
-DTSTART:19980329T030000
-RDATE:19980329T030000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20030101T000000
+RDATE:20030101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20030330T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20031026T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Volgograd.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Volgograd.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Volgograd.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,121 +1,116 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Volgograd
 X-LIC-LOCATION:Europe/Volgograd
+BEGIN:STANDARD
+DTSTART:19200103T000000
+RDATE:19200103T000000
+TZNAME:TSAT
+TZOFFSETFROM:+025740
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19250406T000000
+RDATE:19250406T000000
+TZNAME:STAT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:STAT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19611111T000000
+RDATE:19611111T000000
+RDATE:19890326T020000
+RDATE:19920329T020000
+TZNAME:VOLST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
+TZNAME:VOLST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:VOLST
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:VOLT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:VOLT
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19880924T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:VOLT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:VOLT
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19880924T220000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19880326T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:VOLST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:VOLST
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19880326T220000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:VOLT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:VOLT
-DTSTART:19890924T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19900325T020000
+RDATE:19900325T020000
+TZNAME:VOLST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:VOLST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
+DTSTART:19910331T020000
+RDATE:19910331T020000
 TZNAME:VOLT
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:VOLT
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+025740
-TZOFFSETTO:+0300
-TZNAME:TSAT
-DTSTART:19200103T000000
-RDATE:19200103T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-TZNAME:STAT
-DTSTART:19250406T000000
-RDATE:19250406T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:STAT
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
+DTSTART:19920926T230000
+RDATE:19920926T230000
 TZNAME:VOLT
-DTSTART:19611111T000000
-RDATE:19611111T000000
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:VOLST
-DTSTART:19890326T020000
-RDATE:19890326T020000
-RDATE:19920329T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:VOLST
-DTSTART:19900325T020000
-RDATE:19900325T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T230000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:VOLT
-DTSTART:19910331T020000
-RDATE:19910331T020000
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:VOLT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:VOLT
-DTSTART:19920926T230000
-RDATE:19920926T230000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Warsaw.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Warsaw.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Warsaw.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,177 +1,190 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Warsaw
 X-LIC-LOCATION:Europe/Warsaw
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:WMT
+TZOFFSETFROM:+0124
+TZOFFSETTO:+0124
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19150805T000000
+RDATE:19150805T000000
+TZNAME:CEST
+TZOFFSETFROM:+0124
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450429T000000
+RDATE:19460414T000000
+RDATE:19470504T020000
+RDATE:19480418T020000
+RDATE:19490410T020000
+RDATE:19570602T010000
+RDATE:19580330T010000
+RDATE:19590531T010000
+RDATE:19600403T010000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170917T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441004T020000
+RDATE:19451101T000000
+RDATE:19461007T030000
+RDATE:19770925T020000
+RDATE:19781001T020000
 TZNAME:CET
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19570929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T000000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19591004T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19611001T000000Z
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19610528T010000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=-1SU;UNTIL=19640531T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19180916T030000
+RDATE:19180916T030000
+TZNAME:EET
 TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19620930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19640927T000000Z
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
+DTSTART:19190415T020000
+RDATE:19190415T020000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19190916T030000
+RRULE:FREQ=YEARLY;UNTIL=19190916T000000Z;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19220601T000000
+RDATE:19220601T000000
 TZNAME:CEST
-DTSTART:19770403T010000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19870927T000000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400623T020000
+RDATE:19400623T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19441001T000000
+RDATE:19441001T000000
 TZNAME:CEST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19870329T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19880327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19880925T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0124
-TZOFFSETTO:+0124
-TZNAME:WMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0124
+DTSTART:19591004T020000
+RRULE:FREQ=YEARLY;UNTIL=19611001T000000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19150805T000000
-RDATE:19150805T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19610528T010000
+RRULE:FREQ=YEARLY;UNTIL=19640531T000000Z;BYDAY=-1SU;BYMONTH=5
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19160430T230000
-RDATE:19160430T230000
-RDATE:19400623T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450429T000000
-RDATE:19460414T000000
-RDATE:19470504T020000
-RDATE:19480418T020000
-RDATE:19490410T020000
-RDATE:19570602T010000
-RDATE:19580330T010000
-RDATE:19590531T010000
-RDATE:19600403T010000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19620930T020000
+RRULE:FREQ=YEARLY;UNTIL=19640927T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170917T030000
-RDATE:19220601T000000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441004T020000
-RDATE:19451101T000000
-RDATE:19461007T030000
-RDATE:19770925T020000
-RDATE:19781001T020000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19180916T030000
-RDATE:19180916T030000
+DTSTART:19770101T000000
+RDATE:19770101T000000
+RDATE:19880101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19190415T020000
-RDATE:19190415T020000
+DTSTART:19770403T010000
+RRULE:FREQ=YEARLY;UNTIL=19800406T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19190916T030000
-RDATE:19190916T030000
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19870927T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19870329T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19880327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:CEST
-DTSTART:19441001T000000
-RDATE:19441001T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19880925T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:CET
-DTSTART:19770101T000000
-RDATE:19770101T000000
-RDATE:19880101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zagreb.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zagreb.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zagreb.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,64 +1,77 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Zagreb
 X-LIC-LOCATION:Europe/Zagreb
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:CET
+TZOFFSETFROM:+0122
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410418T230000
+RDATE:19410418T230000
+RDATE:19450508T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19830925T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0122
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18840101T000000
-RDATE:18840101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410418T230000
-RDATE:19410418T230000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450508T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830925T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19450101T000000
-RDATE:19450101T000000
-RDATE:19821127T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zaporozhye.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zaporozhye.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zaporozhye.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,135 +1,136 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Zaporozhye
 X-LIC-LOCATION:Europe/Zaporozhye
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910929T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19940924T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19920329T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19940326T220000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19950326T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:CUT
 TZOFFSETFROM:+022040
 TZOFFSETTO:+0220
-TZNAME:CUT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:EET
 TZOFFSETFROM:+0220
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19240502T000000
-RDATE:19240502T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:MSK
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19300621T000000
-RDATE:19300621T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19410825T000000
+RDATE:19410825T000000
+TZNAME:CEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410825T000000
-RDATE:19410825T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
 DTSTART:19421102T030000
 RDATE:19421102T030000
 RDATE:19431004T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19430329T020000
-RDATE:19430329T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19431025T000000
+RDATE:19431025T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19431025T000000
-RDATE:19431025T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:EEST
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T000000
+RRULE:FREQ=YEARLY;UNTIL=19940924T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920329T000000
+RRULE:FREQ=YEARLY;UNTIL=19940326T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19950101T000000
+RDATE:19950101T000000
+TZNAME:EEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19950924T040000
+RDATE:19950924T040000
 TZNAME:EET
-DTSTART:19950101T000000
-RDATE:19950101T000000
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19961027T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19950924T040000
-RDATE:19950924T040000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zurich.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zurich.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zurich.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,78 +1,65 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Europe/Zurich
 X-LIC-LOCATION:Europe/Zurich
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19410504T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19420503T010000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+DTSTART:18480912T000000
+RDATE:18480912T000000
+TZNAME:BMT
+TZOFFSETFROM:+003408
+TZOFFSETTO:+002944
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18940601T000000
+RDATE:18940601T000000
+TZNAME:CEST
+TZOFFSETFROM:+002944
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19411005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19421003T220000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19410505T010000
+RRULE:FREQ=YEARLY;UNTIL=19420504T000000Z;BYDAY=1MO;BYMONTH=5
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
+DTSTART:19411006T020000
+RRULE:FREQ=YEARLY;UNTIL=19421005T000000Z;BYDAY=1MO;BYMONTH=10
 TZNAME:CET
-DTSTART:19810927T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+003408
-TZOFFSETTO:+002944
-TZNAME:BMT
-DTSTART:18480912T000000
-RDATE:18480912T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+002944
+DTSTART:19810101T000000
+RDATE:19810101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:18940601T000000
-RDATE:18940601T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19401102T000000
-RDATE:19401102T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19401231T000000
-RDATE:19401231T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:CET
-DTSTART:19810101T000000
-RDATE:19810101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/GB-Eire.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GB-Eire.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GB-Eire.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,258 +1,291 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:GB-Eire
 X-LIC-LOCATION:GB-Eire
 BEGIN:STANDARD
+DTSTART:18471201T000000
+RDATE:18471201T000000
+TZNAME:S
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160521T020000
+RDATE:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T030000
+RDATE:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
 TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19410504T020000
+RDATE:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;UNTIL=19430815T010000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=8
+TZNAME:BST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;UNTIL=19440402T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:BDST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19440917T030000
+RDATE:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;UNTIL=19461006T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19601002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;UNTIL=19590419T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;UNTIL=19671029T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;UNTIL=19670319T020000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
 TZNAME:BST
-DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19711031T030000
+RDATE:19711031T030000
+TZNAME:S
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;UNTIL=19800316T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;UNTIL=19801026T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19891029T010000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
 TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-000115
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18471201T000000
-RDATE:18471201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19460414T020000
-RDATE:19470316T020000
-RDATE:19480314T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19471102T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19410504T020000
-RDATE:19410504T020000
-RDATE:19450402T020000
-RDATE:19470413T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19440917T030000
-RDATE:19440917T030000
-RDATE:19450715T030000
-RDATE:19470810T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19681027T000000
-RDATE:19681027T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/GB.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GB.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GB.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,258 +1,291 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:GB
 X-LIC-LOCATION:GB
 BEGIN:STANDARD
+DTSTART:18471201T000000
+RDATE:18471201T000000
+TZNAME:S
+TZOFFSETFROM:-000115
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160521T020000
+RDATE:19160521T020000
+RDATE:19170408T020000
+RDATE:19180324T020000
+RDATE:19190330T020000
+RDATE:19200328T020000
+RDATE:19210403T020000
+RDATE:19220326T020000
+RDATE:19230422T020000
+RDATE:19240413T020000
+RDATE:19270410T020000
+RDATE:19300413T020000
+RDATE:19330409T020000
+RDATE:19340422T020000
+RDATE:19350414T020000
+RDATE:19380410T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+RDATE:19460414T020000
+RDATE:19470316T020000
+RDATE:19480314T020000
+RDATE:19490403T020000
+RDATE:19530419T020000
+RDATE:19540411T020000
+RDATE:19570414T020000
+RDATE:19600410T020000
+RDATE:19680218T020000
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T030000
+RDATE:19161001T030000
+RDATE:19170917T030000
+RDATE:19180930T030000
+RDATE:19190929T030000
+RDATE:19201025T030000
+RDATE:19211003T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19471102T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230916T030000
+RRULE:FREQ=YEARLY;UNTIL=19240921T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=9
 TZNAME:GMT
-DTSTART:19230916T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19240921T020000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19250419T020000
+RRULE:FREQ=YEARLY;UNTIL=19260418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19250419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19260418T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19251004T030000
+RRULE:FREQ=YEARLY;UNTIL=19381002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19251004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19280422T020000
+RRULE:FREQ=YEARLY;UNTIL=19290421T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19280422T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19290421T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19310419T020000
+RRULE:FREQ=YEARLY;UNTIL=19320417T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19310419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19320417T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19360419T020000
+RRULE:FREQ=YEARLY;UNTIL=19370418T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19360419T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19370418T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19410504T020000
+RDATE:19410504T020000
+RDATE:19450402T020000
+RDATE:19470413T020000
+TZNAME:BDST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19410810T030000
+RRULE:FREQ=YEARLY;UNTIL=19430815T010000Z;BYDAY=SU;BYMONTHDAY=9,10,11,12,13
+ ,14,15;BYMONTH=8
+TZNAME:BST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19410810T030000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19430815T010000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19420405T020000
+RRULE:FREQ=YEARLY;UNTIL=19440402T010000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=4
+TZNAME:BDST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19420405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19440402T010000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19440917T030000
+RDATE:19440917T030000
+RDATE:19450715T030000
+RDATE:19470810T030000
+TZNAME:BST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451007T030000
+RRULE:FREQ=YEARLY;UNTIL=19461006T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19451007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19461006T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19500416T020000
+RRULE:FREQ=YEARLY;UNTIL=19520420T020000Z;BYDAY=SU;BYMONTHDAY=14,15,16,17,1
+ 8,19,20;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19500416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU;UNTIL=19520420T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19501022T030000
+RRULE:FREQ=YEARLY;UNTIL=19521026T020000Z;BYDAY=SU;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19501022T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SU;UNTIL=19521026T020000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19531004T030000
+RRULE:FREQ=YEARLY;UNTIL=19601002T020000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19531004T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19601002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19550417T020000
+RRULE:FREQ=YEARLY;UNTIL=19560422T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19550417T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19560422T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19580420T020000
+RRULE:FREQ=YEARLY;UNTIL=19590419T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19580420T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19590419T020000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19630331T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19611029T030000
+RRULE:FREQ=YEARLY;UNTIL=19671029T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19611029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19671029T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19640322T020000
+RRULE:FREQ=YEARLY;UNTIL=19670319T020000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
 TZNAME:BST
-DTSTART:19640322T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=19,20,21,22,23,24,25;BYDAY=SU;UNTIL=19670319T020000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19711031T030000
+RDATE:19711031T030000
+TZNAME:S
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19720319T020000
+RRULE:FREQ=YEARLY;UNTIL=19800316T020000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19720319T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19721029T030000
+RRULE:FREQ=YEARLY;UNTIL=19801026T020000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19721029T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19891029T010000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=10
+TZNAME:GMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19811025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
 TZNAME:GMT
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-000115
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:18471201T000000
-RDATE:18471201T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19160521T020000
-RDATE:19160521T020000
-RDATE:19170408T020000
-RDATE:19180324T020000
-RDATE:19190330T020000
-RDATE:19200328T020000
-RDATE:19210403T020000
-RDATE:19220326T020000
-RDATE:19230422T020000
-RDATE:19240413T020000
-RDATE:19270410T020000
-RDATE:19300413T020000
-RDATE:19330409T020000
-RDATE:19340422T020000
-RDATE:19350414T020000
-RDATE:19380410T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-RDATE:19460414T020000
-RDATE:19470316T020000
-RDATE:19480314T020000
-RDATE:19490403T020000
-RDATE:19530419T020000
-RDATE:19540411T020000
-RDATE:19570414T020000
-RDATE:19600410T020000
-RDATE:19680218T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19161001T030000
-RDATE:19161001T030000
-RDATE:19170917T030000
-RDATE:19180930T030000
-RDATE:19190929T030000
-RDATE:19201025T030000
-RDATE:19211003T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19471102T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:BDST
-DTSTART:19410504T020000
-RDATE:19410504T020000
-RDATE:19450402T020000
-RDATE:19470413T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19440917T030000
-RDATE:19440917T030000
-RDATE:19450715T030000
-RDATE:19470810T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:BST
-DTSTART:19681027T000000
-RDATE:19681027T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19960101T000000
-RDATE:19960101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/GMT+0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GMT+0.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GMT+0.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:GMT+0
+X-LIC-LOCATION:GMT+0
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/GMT-0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GMT-0.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GMT-0.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:GMT-0
+X-LIC-LOCATION:GMT-0
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/GMT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GMT.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GMT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:GMT
+X-LIC-LOCATION:GMT
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/GMT0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GMT0.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GMT0.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:GMT0
+X-LIC-LOCATION:GMT0
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Greenwich.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Greenwich.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Greenwich.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Greenwich
+X-LIC-LOCATION:Greenwich
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:GMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/HST.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/HST.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/HST.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:HST
+X-LIC-LOCATION:HST
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:HST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Hongkong.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Hongkong.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Hongkong.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,90 +1,114 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Hongkong
 X-LIC-LOCATION:Hongkong
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
+DTSTART:19041030T000000
+RDATE:19041030T000000
+TZNAME:HKST
+TZOFFSETFROM:+073636
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19481031T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19521025T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
+DTSTART:19410401T033000
+RDATE:19410401T033000
+RDATE:19460420T033000
+RDATE:19470413T033000
+RDATE:19480502T033000
+RDATE:19731230T033000
+RDATE:19790513T033000
 TZNAME:HKST
-DTSTART:19490403T033000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19530404T193000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:HKST
-DTSTART:19540321T033000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=18,19,20,21,22,23,24;BYDAY=SU;UNTIL=19640321T193000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19410930T033000
+RDATE:19410930T033000
+RDATE:19461201T033000
+RDATE:19471230T033000
+RDATE:19521025T033000
+RDATE:19531101T033000
+RDATE:19541031T033000
+RDATE:19791021T033000
+TZNAME:HKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19551106T033000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=19641031T183000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19411225T000000
+RDATE:19411225T000000
+TZNAME:JST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450915T000000
+RDATE:19450915T000000
 TZNAME:HKST
-DTSTART:19650418T033000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19770416T193000Z
-END:DAYLIGHT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19481031T033000
+RRULE:FREQ=YEARLY;UNTIL=19511027T183000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:HKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19651017T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19771015T183000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19490403T033000
+RRULE:FREQ=YEARLY;UNTIL=19530404T193000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:HKST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19540321T033000
+RRULE:FREQ=YEARLY;UNTIL=19640321T193000Z;BYDAY=-2SU;BYMONTH=3
 TZNAME:HKST
-DTSTART:19790513T033000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19800510T193000Z
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19551106T033000
+RRULE:FREQ=YEARLY;UNTIL=19641031T183000Z;BYDAY=1SU;BYMONTH=11
+TZNAME:HKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19791021T033000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19801018T183000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+073636
-TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19041030T000000
-RDATE:19041030T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19650418T033000
+RRULE:FREQ=YEARLY;UNTIL=19730421T193000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:HKST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:HKST
-DTSTART:19460420T033000
-RDATE:19460420T033000
-RDATE:19470413T033000
-RDATE:19480502T033000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651017T033000
+RRULE:FREQ=YEARLY;UNTIL=19761016T183000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=10
+TZNAME:HKT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:HKT
-DTSTART:19461201T033000
-RDATE:19461201T033000
-RDATE:19471230T033000
-RDATE:19531101T033000
-RDATE:19541031T033000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740421T033000
+RDATE:19740421T033000
+TZNAME:HKST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19750420T033000
+RRULE:FREQ=YEARLY;UNTIL=19760417T193000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:HKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Iceland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Iceland.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Iceland.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,62 +1,32 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Iceland
 X-LIC-LOCATION:Iceland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:ISST
-DTSTART:19170219T230000
-RRULE:FREQ=YEARLY;UNTIL=19180220T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:ISST
-DTSTART:19430307T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19460303T020000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:IST
-DTSTART:19431024T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19481024T020000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:ISST
-DTSTART:19470406T010000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19670402T020000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:IST
-DTSTART:19501022T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19661023T020000Z
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18370101T000000
+RDATE:18370101T000000
+TZNAME:RMT
 TZOFFSETFROM:-012724
 TZOFFSETTO:-012748
-TZNAME:RMT
-DTSTART:18370101T000000
-RDATE:18370101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19080101T000000
+RDATE:19080101T000000
+TZNAME:ISST
 TZOFFSETFROM:-012748
 TZOFFSETTO:-0100
-TZNAME:IST
-DTSTART:19080101T000000
-RDATE:19080101T000000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170219T230000
+RRULE:FREQ=YEARLY;UNTIL=19180220T000000Z;BYMONTH=2
+TZNAME:ISST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:IST
 DTSTART:19171021T010000
 RDATE:19171021T010000
 RDATE:19181116T010000
@@ -66,23 +36,54 @@
 RDATE:19421025T020000
 RDATE:19491030T020000
 RDATE:19671029T020000
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:ISST
 DTSTART:19390429T230000
 RDATE:19390429T230000
 RDATE:19400225T020000
 RDATE:19410302T010000
 RDATE:19420308T010000
+TZNAME:ISST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19430307T010000
+RRULE:FREQ=YEARLY;UNTIL=19460303T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ISST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19431024T020000
+RRULE:FREQ=YEARLY;UNTIL=19481024T020000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470406T010000
+RRULE:FREQ=YEARLY;UNTIL=19670402T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ISST
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:GMT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19501022T020000
+RRULE:FREQ=YEARLY;UNTIL=19661023T020000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19680407T010000
 RDATE:19680407T010000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Antananarivo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Antananarivo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Antananarivo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Antananarivo
 X-LIC-LOCATION:Indian/Antananarivo
 BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:EAT
 TZOFFSETFROM:+031004
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19110701T000000
-RDATE:19110701T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19540227T230000
+RDATE:19540227T230000
+TZNAME:EAST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0400
-TZNAME:EAST
-DTSTART:19540227T230000
-RDATE:19540227T230000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19540530T000000
+RDATE:19540530T000000
+TZNAME:EAT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19540530T000000
-RDATE:19540530T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Chagos.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Chagos.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Chagos.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Chagos
 X-LIC-LOCATION:Indian/Chagos
 BEGIN:STANDARD
+DTSTART:19070101T000000
+RDATE:19070101T000000
+TZNAME:IOT
 TZOFFSETFROM:+044940
 TZOFFSETTO:+0500
-TZNAME:IOT
-DTSTART:19070101T000000
-RDATE:19070101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:IOT
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0600
-TZNAME:IOT
-DTSTART:19960101T000000
-RDATE:19960101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Christmas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Christmas.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Christmas.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Christmas
 X-LIC-LOCATION:Indian/Christmas
 BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:CXT
 TZOFFSETFROM:+070252
 TZOFFSETTO:+0700
-TZNAME:CXT
-DTSTART:18950201T000000
-RDATE:18950201T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Cocos.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Cocos.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Cocos.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Cocos
 X-LIC-LOCATION:Indian/Cocos
 BEGIN:STANDARD
+DTSTART:19000101T000000
+RDATE:19000101T000000
+TZNAME:CCT
 TZOFFSETFROM:+062740
 TZOFFSETTO:+0630
-TZNAME:CCT
-DTSTART:19000101T000000
-RDATE:19000101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Comoro.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Comoro.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Comoro.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Comoro
 X-LIC-LOCATION:Indian/Comoro
 BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:EAT
 TZOFFSETFROM:+025304
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19110701T000000
-RDATE:19110701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Kerguelen.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Kerguelen.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Kerguelen.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Kerguelen
 X-LIC-LOCATION:Indian/Kerguelen
 BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:TFT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0500
-TZNAME:TFT
-DTSTART:19500101T000000
-RDATE:19500101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mahe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mahe.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mahe.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Mahe
 X-LIC-LOCATION:Indian/Mahe
 BEGIN:STANDARD
+DTSTART:19060601T000000
+RDATE:19060601T000000
+TZNAME:SCT
 TZOFFSETFROM:+034148
 TZOFFSETTO:+0400
-TZNAME:SCT
-DTSTART:19060601T000000
-RDATE:19060601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Maldives.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Maldives.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Maldives.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Maldives
 X-LIC-LOCATION:Indian/Maldives
 BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
 TZOFFSETFROM:+0454
 TZOFFSETTO:+0454
-TZNAME:MMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19600101T000000
+RDATE:19600101T000000
+TZNAME:MVT
 TZOFFSETFROM:+0454
 TZOFFSETTO:+0500
-TZNAME:MVT
-DTSTART:19600101T000000
-RDATE:19600101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mauritius.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mauritius.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mauritius.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,32 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Mauritius
 X-LIC-LOCATION:Indian/Mauritius
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:MUST
-DTSTART:20081026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:MUT
-DTSTART:20090329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0350
-TZOFFSETTO:+0400
-TZNAME:MUT
 DTSTART:19070101T000000
 RDATE:19070101T000000
+TZNAME:MUST
+TZOFFSETFROM:+0350
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:MUST
 DTSTART:19821010T000000
 RDATE:19821010T000000
+RDATE:20081026T020000
+TZNAME:MUST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:MUT
 DTSTART:19830321T000000
 RDATE:19830321T000000
+RDATE:20090329T020000
+TZNAME:MUT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mayotte.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mayotte.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mayotte.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Mayotte
 X-LIC-LOCATION:Indian/Mayotte
 BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:EAT
 TZOFFSETFROM:+030056
 TZOFFSETTO:+0300
-TZNAME:EAT
-DTSTART:19110701T000000
-RDATE:19110701T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Reunion.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Reunion.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Reunion.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Indian/Reunion
 X-LIC-LOCATION:Indian/Reunion
 BEGIN:STANDARD
+DTSTART:19110601T000000
+RDATE:19110601T000000
+TZNAME:RET
 TZOFFSETFROM:+034152
 TZOFFSETTO:+0400
-TZNAME:RET
-DTSTART:19110601T000000
-RDATE:19110601T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Iran.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Iran.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Iran.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,272 +1,159 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Iran
 X-LIC-LOCATION:Iran
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:19790321T000000
-RRULE:FREQ=YEARLY;UNTIL=19800320T203000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19910922T000000
-RRULE:FREQ=YEARLY;UNTIL=19950921T193000Z
+DTSTART:19160101T000000
+RDATE:19160101T000000
+TZNAME:TMT
+TZOFFSETFROM:+032544
+TZOFFSETTO:+032544
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:19920322T000000
-RRULE:FREQ=YEARLY;UNTIL=19950321T203000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:19970322T000000
-RRULE:FREQ=YEARLY;UNTIL=19990321T203000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:19460101T000000
+RDATE:19460101T000000
 TZNAME:IRST
-DTSTART:19970922T000000
-RRULE:FREQ=YEARLY;UNTIL=19990921T193000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20010322T000000
-RRULE:FREQ=YEARLY;UNTIL=20030321T203000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0430
+TZOFFSETFROM:+032544
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20010922T000000
-RRULE:FREQ=YEARLY;UNTIL=20030921T193000Z
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20090322T000000
-RRULE:FREQ=YEARLY;UNTIL=20110321T203000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:19771101T000000
+RDATE:19771101T000000
 TZNAME:IRST
-DTSTART:20090922T000000
-RRULE:FREQ=YEARLY;UNTIL=20110921T193000Z
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0400
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
+DTSTART:19780321T000000
+RDATE:19780321T000000
 TZNAME:IRDT
-DTSTART:20130322T000000
-RRULE:FREQ=YEARLY;UNTIL=20150321T203000Z
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:19781021T000000
+RDATE:19781021T000000
 TZNAME:IRST
-DTSTART:20130922T000000
-RRULE:FREQ=YEARLY;UNTIL=20150921T193000Z
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20170322T000000
-RRULE:FREQ=YEARLY;UNTIL=20190321T203000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:19790101T000000
+RDATE:19790101T000000
 TZNAME:IRST
-DTSTART:20170922T000000
-RRULE:FREQ=YEARLY;UNTIL=20190921T193000Z
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0330
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790321T000000
+RRULE:FREQ=YEARLY;UNTIL=19800320T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20210322T000000
-RRULE:FREQ=YEARLY;UNTIL=20230321T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19790919T000000
+RDATE:19790919T000000
+RDATE:19800923T000000
+RDATE:19960921T000000
+RDATE:20000921T000000
+RDATE:20040921T000000
+RDATE:20050922T000000
+RDATE:20080921T000000
+RDATE:20120921T000000
+RDATE:20160921T000000
+RDATE:20170922T000000
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20210922T000000
-RRULE:FREQ=YEARLY;UNTIL=20230921T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19910503T000000
+RDATE:19910503T000000
+RDATE:19960321T000000
+RDATE:20000321T000000
+RDATE:20040321T000000
+RDATE:20050322T000000
+RDATE:20080321T000000
+RDATE:20120321T000000
+RDATE:20160321T000000
+RDATE:20170322T000000
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20250322T000000
-RRULE:FREQ=YEARLY;UNTIL=20270321T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19910922T000000
+RRULE:FREQ=YEARLY;UNTIL=19950921T193000Z;BYMONTH=9
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20250922T000000
-RRULE:FREQ=YEARLY;UNTIL=20270921T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19920322T000000
+RRULE:FREQ=YEARLY;UNTIL=19950321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20280321T000000
-RRULE:FREQ=YEARLY;UNTIL=20290320T203000Z
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20280921T000000
-RRULE:FREQ=YEARLY;UNTIL=20290920T193000Z
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19970322T000000
+RRULE:FREQ=YEARLY;UNTIL=19990321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20300322T000000
-RRULE:FREQ=YEARLY;UNTIL=20310321T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19970922T000000
+RRULE:FREQ=YEARLY;UNTIL=19990921T193000Z;BYMONTH=9
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20300922T000000
-RRULE:FREQ=YEARLY;UNTIL=20310921T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010322T000000
+RRULE:FREQ=YEARLY;UNTIL=20030321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20320321T000000
-RRULE:FREQ=YEARLY;UNTIL=20330320T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20010922T000000
+RRULE:FREQ=YEARLY;UNTIL=20030921T193000Z;BYMONTH=9
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20320921T000000
-RRULE:FREQ=YEARLY;UNTIL=20330920T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20090322T000000
+RRULE:FREQ=YEARLY;UNTIL=20110321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20340322T000000
-RRULE:FREQ=YEARLY;UNTIL=20350321T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20090922T000000
+RRULE:FREQ=YEARLY;UNTIL=20110921T193000Z;BYMONTH=9
+TZNAME:IRST
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:20340922T000000
-RRULE:FREQ=YEARLY;UNTIL=20350921T193000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20130322T000000
+RRULE:FREQ=YEARLY;UNTIL=20150321T203000Z;BYMONTH=3
+TZNAME:IRDT
 TZOFFSETFROM:+0330
 TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:20360321T000000
-RRULE:FREQ=YEARLY;UNTIL=20370320T203000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
+DTSTART:20130922T000000
+RRULE:FREQ=YEARLY;UNTIL=20150921T193000Z;BYMONTH=9
 TZNAME:IRST
-DTSTART:20360921T000000
-RRULE:FREQ=YEARLY;UNTIL=20370920T193000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+032544
-TZOFFSETTO:+032544
-TZNAME:TMT
-DTSTART:19160101T000000
-RDATE:19160101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+032544
-TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19460101T000000
-RDATE:19460101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0400
-TZNAME:IRST
-DTSTART:19771101T000000
-RDATE:19771101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-TZNAME:IRDT
-DTSTART:19780321T000000
-RDATE:19780321T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-TZNAME:IRST
-DTSTART:19781021T000000
-RDATE:19781021T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19790101T000000
-RDATE:19790101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0430
 TZOFFSETTO:+0330
-TZNAME:IRST
-DTSTART:19790919T000000
-RDATE:19790919T000000
-RDATE:19800923T000000
-RDATE:19960921T000000
-RDATE:20000921T000000
-RDATE:20040921T000000
-RDATE:20050922T000000
-RDATE:20080921T000000
-RDATE:20120921T000000
-RDATE:20160921T000000
-RDATE:20200921T000000
-RDATE:20240921T000000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-TZNAME:IRDT
-DTSTART:19910503T000000
-RDATE:19910503T000000
-RDATE:19960321T000000
-RDATE:20000321T000000
-RDATE:20040321T000000
-RDATE:20050322T000000
-RDATE:20080321T000000
-RDATE:20120321T000000
-RDATE:20160321T000000
-RDATE:20200321T000000
-RDATE:20240321T000000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Israel.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Israel.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Israel.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,88 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Israel
 X-LIC-LOCATION:Israel
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19421101T000000
-RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19481101T020000
-RRULE:FREQ=YEARLY;UNTIL=19491031T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:IST
-DTSTART:19880903T000000
-RRULE:FREQ=YEARLY;UNTIL=19890902T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20060331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20100326T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20100326T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20120330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20150327T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20150327T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20170331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20210326T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20210326T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20230331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20320326T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20320326T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
-DTSTART:20340331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=26,27,28,29,30,31;BYDAY=FR;UNTIL=20370327T000000Z
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;BYDAY=FR;UNTIL=20370327T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+022056
-TZOFFSETTO:+022040
-TZNAME:JMT
 DTSTART:18800101T000000
 RDATE:18800101T000000
+TZNAME:JMT
+TZOFFSETFROM:+022056
+TZOFFSETTO:+022040
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+022040
-TZOFFSETTO:+0200
-TZNAME:IST
 DTSTART:19180101T000000
 RDATE:19180101T000000
+TZNAME:IST
+TZOFFSETFROM:+022040
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:IDT
 DTSTART:19400601T000000
 RDATE:19400601T000000
 RDATE:19430401T020000
@@ -123,13 +60,19 @@
 RDATE:20050401T020000
 RDATE:20110401T020000
 RDATE:20160401T020000
-RDATE:20220401T020000
-RDATE:20330401T020000
+RDATE:20170331T020000
+TZNAME:IDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421101T000000
+RRULE:FREQ=YEARLY;UNTIL=19441031T210000Z;BYMONTH=11
+TZNAME:IST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
-TZNAME:IST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19451101T020000
 RDATE:19451101T020000
 RDATE:19461101T000000
@@ -146,6 +89,8 @@
 RDATE:19850915T000000
 RDATE:19860907T000000
 RDATE:19870913T000000
+RDATE:19880903T000000
+RDATE:19890903T000000
 RDATE:19900826T000000
 RDATE:19910901T000000
 RDATE:19920906T000000
@@ -174,40 +119,46 @@
 RDATE:20150920T020000
 RDATE:20161009T020000
 RDATE:20170924T020000
-RDATE:20180916T020000
-RDATE:20191006T020000
-RDATE:20200927T020000
-RDATE:20210912T020000
-RDATE:20221002T020000
-RDATE:20230924T020000
-RDATE:20241006T020000
-RDATE:20250928T020000
-RDATE:20260920T020000
-RDATE:20271010T020000
-RDATE:20280924T020000
-RDATE:20290916T020000
-RDATE:20301006T020000
-RDATE:20310921T020000
-RDATE:20320912T020000
-RDATE:20331002T020000
-RDATE:20340917T020000
-RDATE:20351007T020000
-RDATE:20360928T020000
-RDATE:20370913T020000
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0400
-TZNAME:IDDT
 DTSTART:19480523T000000
 RDATE:19480523T000000
+TZNAME:IDDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19480901T000000
+RDATE:19480901T000000
+TZNAME:IDT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19481101T020000
+RRULE:FREQ=YEARLY;UNTIL=19491031T230000Z;BYMONTH=11
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20060331T020000
+RRULE:FREQ=YEARLY;UNTIL=20100326T000000Z;BYDAY=FR;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=3
 TZNAME:IDT
-DTSTART:19480901T000000
-RDATE:19480901T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20120330T020000
+RRULE:FREQ=YEARLY;UNTIL=20150327T000000Z;BYDAY=FR;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=3
+TZNAME:IDT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Jamaica.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Jamaica.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Jamaica.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Jamaica
 X-LIC-LOCATION:Jamaica
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19831030T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KMT
 TZOFFSETFROM:-050712
 TZOFFSETTO:-050712
-TZNAME:KMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19120201T000000
+RDATE:19120201T000000
+TZNAME:EST
 TZOFFSETFROM:-050712
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740428T020000
+RDATE:19740428T020000
 TZNAME:EST
-DTSTART:19120201T000000
-RDATE:19120201T000000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=19831030T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19750223T020000
+RDATE:19750223T020000
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T070000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:EDT
-DTSTART:19740428T020000
-RDATE:19740428T020000
-RDATE:19750223T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19840101T000000
+RDATE:19840101T000000
+TZNAME:EST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19840101T000000
-RDATE:19840101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Japan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Japan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Japan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,52 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Japan
 X-LIC-LOCATION:Japan
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
+DTSTART:18880101T001859
+RDATE:18880101T001859
 TZNAME:JST
-DTSTART:19480911T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=2SA;UNTIL=19510907T160000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-TZNAME:JDT
-DTSTART:19500507T020000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19510505T170000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+091859
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:18880101T001859
-RDATE:18880101T001859
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18960101T000000
+RDATE:18960101T000000
+TZNAME:CJT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:CJT
-DTSTART:18960101T000000
-RDATE:18960101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19380101T000000
+RDATE:19380101T000000
+TZNAME:JST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19380101T000000
-RDATE:19380101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-TZNAME:JDT
 DTSTART:19480502T020000
 RDATE:19480502T020000
 RDATE:19490403T020000
+TZNAME:JDT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19480911T020000
+RRULE:FREQ=YEARLY;UNTIL=19510907T160000Z;BYDAY=2SA;BYMONTH=9
+TZNAME:JST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19500507T020000
+RRULE:FREQ=YEARLY;UNTIL=19510505T170000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:JDT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Kwajalein.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Kwajalein.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Kwajalein.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Kwajalein
 X-LIC-LOCATION:Kwajalein
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:MHT
 TZOFFSETFROM:+110920
 TZOFFSETTO:+1100
-TZNAME:MHT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19691001T000000
+RDATE:19691001T000000
+TZNAME:KWAT
 TZOFFSETFROM:+1100
 TZOFFSETTO:-1200
-TZNAME:KWAT
-DTSTART:19691001T000000
-RDATE:19691001T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19930820T000000
+RDATE:19930820T000000
+TZNAME:MHT
 TZOFFSETFROM:-1200
 TZOFFSETTO:+1200
-TZNAME:MHT
-DTSTART:19930820T000000
-RDATE:19930820T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Libya.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Libya.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Libya.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,82 +1,95 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Libya
 X-LIC-LOCATION:Libya
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:CEST
+TZOFFSETFROM:+005244
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19511014T020000
+RDATE:19511014T020000
+RDATE:19531009T020000
+RDATE:19550930T000000
+RDATE:19850406T000000
+RDATE:19860404T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19820401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19520101T000000
+RDATE:19520101T000000
+RDATE:19540101T000000
+RDATE:19560101T000000
+RDATE:19861003T000000
+RDATE:19960930T000000
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19590101T000000
+RDATE:19590101T000000
+RDATE:19900504T000000
+TZNAME:EET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
 TZNAME:CEST
-DTSTART:19870401T000000
-RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19871001T000000
-RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19820401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+005244
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19200101T000000
-RDATE:19200101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870401T000000
+RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19511014T020000
-RDATE:19511014T020000
-RDATE:19531009T020000
-RDATE:19550930T000000
-RDATE:19850406T000000
-RDATE:19860404T000000
-RDATE:19970404T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19871001T000000
+RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19520101T000000
-RDATE:19520101T000000
-RDATE:19540101T000000
-RDATE:19560101T000000
-RDATE:19820101T000000
-RDATE:19861003T000000
-RDATE:19960930T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19970404T000000
+RDATE:19970404T000000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19590101T000000
-RDATE:19590101T000000
-RDATE:19900504T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19971004T000000
+RDATE:19971004T000000
+TZNAME:EET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19971004T000000
-RDATE:19971004T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/MET.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/MET.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/MET.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,87 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:MET
+X-LIC-LOCATION:MET
+BEGIN:STANDARD
+DTSTART:18000101T010000
+RDATE:18000101T010000
+TZNAME:MEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+TZNAME:MEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+RDATE:19770925T030000
+RDATE:19781001T030000
+TZNAME:MET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:MEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
+TZNAME:MET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19440403T020000
+RRULE:FREQ=YEARLY;UNTIL=19450402T010000Z;BYDAY=1MO;BYMONTH=4
+TZNAME:MEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19770403T020000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:MEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:MET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/MST.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/MST.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/MST.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:MST
+X-LIC-LOCATION:MST
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/MST7MDT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/MST7MDT.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/MST7MDT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,101 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:MST7MDT
+X-LIC-LOCATION:MST7MDT
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaNorte.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaNorte.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaNorte.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,102 +1,154 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Mexico/BajaNorte
 X-LIC-LOCATION:Mexico/BajaNorte
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19220101T001156
+RDATE:19220101T001156
+TZNAME:MST
+TZOFFSETFROM:-074804
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240101T000000
+RDATE:19240101T000000
+RDATE:19301115T000000
+RDATE:19310930T000000
+RDATE:19451112T000000
+RDATE:19490114T000000
+RDATE:20011028T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19270610T230000
+RDATE:19270610T230000
+TZNAME:MST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310401T000000
+RDATE:19310401T000000
+RDATE:19480405T000000
 TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420424T000000
+RDATE:19420424T000000
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19540101T000000
+RDATE:19540101T000000
+RDATE:19610101T000000
+RDATE:19760101T000000
+RDATE:19960101T000000
+RDATE:20010101T000000
+RDATE:20020220T000000
+RDATE:20100101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19540425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19600424T100000Z
+RRULE:FREQ=YEARLY;UNTIL=19600424T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19540926T020000
+RRULE:FREQ=YEARLY;UNTIL=19600925T090000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19540926T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19600925T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19761031T020000
+RRULE:FREQ=YEARLY;UNTIL=19951029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19761031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19950402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T100000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-074804
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19220101T001156
-RDATE:19220101T001156
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19240101T000000
-RDATE:19240101T000000
-RDATE:19301115T000000
-RDATE:19310930T000000
-RDATE:19451112T000000
-RDATE:19490114T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19270610T230000
-RDATE:19270610T230000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20010401T020000
+RDATE:20010401T020000
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19310401T000000
-RDATE:19310401T000000
-RDATE:19480405T000000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20090405T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PWT
-DTSTART:19420424T000000
-RDATE:19420424T000000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;UNTIL=20091025T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PPT
-DTSTART:19450814T160000
-RDATE:19450814T160000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
+DTSTART:20101107T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19540101T000000
-RDATE:19540101T000000
-RDATE:19610101T000000
-RDATE:19760101T000000
-RDATE:19960101T000000
-RDATE:20010101T000000
-RDATE:20020220T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaSur.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaSur.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaSur.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,83 +1,84 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Mexico/BajaSur
 X-LIC-LOCATION:Mexico/BajaSur
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T090000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
+DTSTART:19211231T235420
+RDATE:19211231T235420
 TZNAME:MST
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T080000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20021027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-070540
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19211231T235420
-RDATE:19211231T235420
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19270610T230000
 RDATE:19270610T230000
 RDATE:19310501T230000
 RDATE:19320401T000000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
 DTSTART:19301115T000000
 RDATE:19301115T000000
 RDATE:19311001T000000
 RDATE:19420424T000000
 RDATE:20010930T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19490114T000000
+RDATE:19490114T000000
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19490114T000000
-RDATE:19490114T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19700101T000000
+RDATE:19700101T000000
+TZNAME:MST
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19700101T000000
-RDATE:19700101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:20010506T020000
 RDATE:20010506T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/General.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/General.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/General.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,95 +1,96 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Mexico/General
 X-LIC-LOCATION:Mexico/General
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20000402T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20001029T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20021027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19220101T002324
+RDATE:19220101T002324
+TZNAME:MST
 TZOFFSETFROM:-063636
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19220101T002324
-RDATE:19220101T002324
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19270610T230000
 RDATE:19270610T230000
 RDATE:19310501T230000
 RDATE:19320401T000000
+TZNAME:CST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
 DTSTART:19301115T000000
 RDATE:19301115T000000
 RDATE:19311001T000000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
 DTSTART:19390205T000000
 RDATE:19390205T000000
 RDATE:19401209T000000
 RDATE:19500212T000000
 RDATE:20010506T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19390625T000000
 RDATE:19390625T000000
 RDATE:19410401T000000
 RDATE:19440501T000000
 RDATE:19500730T000000
 RDATE:20010930T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19431216T000000
+RDATE:19431216T000000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19431216T000000
-RDATE:19431216T000000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20020220T000000
 RDATE:20020220T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20021027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/NZ-CHAT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/NZ-CHAT.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/NZ-CHAT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,72 +1,73 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:NZ-CHAT
 X-LIC-LOCATION:NZ-CHAT
+BEGIN:STANDARD
+DTSTART:19570101T000000
+RDATE:19570101T000000
+TZNAME:CHAST
+TZOFFSETFROM:+121348
+TZOFFSETTO:+1245
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19741103T024500
+RDATE:19741103T024500
+RDATE:19891008T024500
+TZNAME:CHADT
 TZOFFSETFROM:+1245
 TZOFFSETTO:+1345
-TZNAME:CHADT
-DTSTART:19751026T024500
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19881029T140000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
+DTSTART:19750223T034500
+RDATE:19750223T034500
 TZNAME:CHAST
-DTSTART:19760307T034500
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19890304T140000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
-DTSTART:19900318T034500
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1245
-TZOFFSETTO:+1345
+DTSTART:19751026T024500
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CHADT
-DTSTART:19901007T024500
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1245
 TZOFFSETTO:+1345
-TZNAME:CHADT
-DTSTART:20070930T024500
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19760307T034500
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CHAST
 TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
-DTSTART:20080406T034500
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+121348
+DTSTART:19900318T034500
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CHAST
+TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
-DTSTART:19570101T000000
-RDATE:19570101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19901007T024500
+RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CHADT
 TZOFFSETFROM:+1245
 TZOFFSETTO:+1345
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070930T024500
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9
 TZNAME:CHADT
-DTSTART:19741103T024500
-RDATE:19741103T024500
-RDATE:19891008T024500
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T034500
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CHAST
 TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
-DTSTART:19750223T034500
-RDATE:19750223T034500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/NZ.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/NZ.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/NZ.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,121 +1,122 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:NZ
 X-LIC-LOCATION:NZ
+BEGIN:STANDARD
+DTSTART:18681102T000000
+RDATE:18681102T000000
+TZNAME:NZST
+TZOFFSETFROM:+113904
+TZOFFSETTO:+1130
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19271106T020000
+RDATE:19271106T020000
+TZNAME:NZST
 TZOFFSETFROM:+1130
+TZOFFSETTO:+1230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19280304T020000
+RDATE:19280304T020000
+TZNAME:NZMT
+TZOFFSETFROM:+1230
+TZOFFSETTO:+1130
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19281014T020000
+RRULE:FREQ=YEARLY;UNTIL=19331007T143000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1130
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19281014T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19331007T143000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19290317T020000
+RRULE:FREQ=YEARLY;UNTIL=19330318T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZMT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1130
-TZNAME:NZMT
-DTSTART:19290317T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19330318T140000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19340429T020000
+RRULE:FREQ=YEARLY;UNTIL=19400427T140000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:NZMT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1130
-TZNAME:NZMT
-DTSTART:19340429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19400427T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19340930T020000
+RRULE:FREQ=YEARLY;UNTIL=19400928T143000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:NZST
 TZOFFSETFROM:+1130
 TZOFFSETTO:+1200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
 TZNAME:NZST
-DTSTART:19340930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19400928T143000Z
-END:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19741103T020000
+RDATE:19741103T020000
+RDATE:19891008T020000
+TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19881029T140000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
+DTSTART:19750223T030000
+RDATE:19750223T030000
 TZNAME:NZST
-DTSTART:19760307T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19890304T140000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NZDT
-DTSTART:19901007T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:20070930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19760307T030000
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+113904
-TZOFFSETTO:+1130
-TZNAME:NZMT
-DTSTART:18681102T000000
-RDATE:18681102T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1130
-TZOFFSETTO:+1230
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:NZST
-DTSTART:19271106T020000
-RDATE:19271106T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1230
-TZOFFSETTO:+1130
-TZNAME:NZMT
-DTSTART:19280304T020000
-RDATE:19280304T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1200
+TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19460101T000000
-RDATE:19460101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19901007T020000
+RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070930T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9
 TZNAME:NZDT
-DTSTART:19741103T020000
-RDATE:19741103T020000
-RDATE:19891008T020000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19750223T030000
-RDATE:19750223T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Navajo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Navajo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Navajo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,111 +1,134 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Navajo
 X-LIC-LOCATION:Navajo
+BEGIN:STANDARD
+DTSTART:18831118T120004
+RDATE:18831118T120004
+TZNAME:MST
+TZOFFSETFROM:-065956
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19210327T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
 TZNAME:MST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T080000Z
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200328T020000
+RRULE:FREQ=YEARLY;UNTIL=19210327T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19650425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19210522T020000
+RDATE:19450930T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19651031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19650425T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-065956
-TZOFFSETTO:-0700
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:MST
-DTSTART:18831118T120004
-RDATE:18831118T120004
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19210522T020000
-RDATE:19210522T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZNAME:MDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/PRC.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/PRC.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/PRC.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,52 +1,54 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:PRC
 X-LIC-LOCATION:PRC
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
+DTSTART:19280101T000000
+RDATE:19280101T000000
 TZNAME:CST
-DTSTART:19401001T000000
-RRULE:FREQ=YEARLY;UNTIL=19410930T150000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0900
+TZOFFSETFROM:+080552
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19860914T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=SU;UNTIL=19910914T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19400603T000000
+RDATE:19400603T000000
+RDATE:19410316T000000
+RDATE:19860504T000000
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19870412T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=10,11,12,13,14,15,16;BYDAY=SU;UNTIL=19910413T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+080552
+DTSTART:19401001T000000
+RRULE:FREQ=YEARLY;UNTIL=19410930T150000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19490101T000000
+RDATE:19490101T000000
 TZNAME:CST
-DTSTART:19280101T000000
-RDATE:19280101T000000
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0800
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860914T000000
+RRULE:FREQ=YEARLY;UNTIL=19910914T150000Z;BYDAY=SU;BYMONTHDAY=11,12,13,14,1
+ 5,16,17;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19870412T000000
+RRULE:FREQ=YEARLY;UNTIL=19910413T160000Z;BYDAY=-3SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19400603T000000
-RDATE:19400603T000000
-RDATE:19410316T000000
-RDATE:19860504T000000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19490101T000000
-RDATE:19490101T000000
-END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/PST8PDT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/PST8PDT.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/PST8PDT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,101 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:PST8PDT
+X-LIC-LOCATION:PST8PDT
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T100000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Apia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Apia.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Apia.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Apia
 X-LIC-LOCATION:Pacific/Apia
 BEGIN:STANDARD
-TZOFFSETFROM:+123304
-TZOFFSETTO:-112656
-TZNAME:LMT
-DTSTART:18790705T000000
-RDATE:18790705T000000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19110101T000000
+RDATE:19110101T000000
+TZNAME:SAMT
 TZOFFSETFROM:-112656
 TZOFFSETTO:-1130
-TZNAME:SAMT
-DTSTART:19110101T000000
-RDATE:19110101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:WST
 TZOFFSETFROM:-1130
 TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100926T000000
+RDATE:20100926T000000
+TZNAME:WSDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110403T010000
+RDATE:20110403T010000
 TZNAME:WST
-DTSTART:19500101T000000
-RDATE:19500101T000000
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Auckland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Auckland.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Auckland.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,121 +1,122 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Auckland
 X-LIC-LOCATION:Pacific/Auckland
+BEGIN:STANDARD
+DTSTART:18681102T000000
+RDATE:18681102T000000
+TZNAME:NZST
+TZOFFSETFROM:+113904
+TZOFFSETTO:+1130
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19271106T020000
+RDATE:19271106T020000
+TZNAME:NZST
 TZOFFSETFROM:+1130
+TZOFFSETTO:+1230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19280304T020000
+RDATE:19280304T020000
+TZNAME:NZMT
+TZOFFSETFROM:+1230
+TZOFFSETTO:+1130
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19281014T020000
+RRULE:FREQ=YEARLY;UNTIL=19331007T143000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1130
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19281014T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19331007T143000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19290317T020000
+RRULE:FREQ=YEARLY;UNTIL=19330318T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZMT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1130
-TZNAME:NZMT
-DTSTART:19290317T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=19330318T140000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19340429T020000
+RRULE:FREQ=YEARLY;UNTIL=19400427T140000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:NZMT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1130
-TZNAME:NZMT
-DTSTART:19340429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19400427T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19340930T020000
+RRULE:FREQ=YEARLY;UNTIL=19400928T143000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:NZST
 TZOFFSETFROM:+1130
 TZOFFSETTO:+1200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
 TZNAME:NZST
-DTSTART:19340930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19400928T143000Z
-END:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19741103T020000
+RDATE:19741103T020000
+RDATE:19891008T020000
+TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19881029T140000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
+DTSTART:19750223T030000
+RDATE:19750223T030000
 TZNAME:NZST
-DTSTART:19760307T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19890304T140000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:NZDT
-DTSTART:19901007T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:20070930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19760307T030000
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+113904
-TZOFFSETTO:+1130
-TZNAME:NZMT
-DTSTART:18681102T000000
-RDATE:18681102T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1130
-TZOFFSETTO:+1230
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
 TZNAME:NZST
-DTSTART:19271106T020000
-RDATE:19271106T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1230
-TZOFFSETTO:+1130
-TZNAME:NZMT
-DTSTART:19280304T020000
-RDATE:19280304T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+1200
+TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19460101T000000
-RDATE:19460101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19901007T020000
+RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:NZDT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070930T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9
 TZNAME:NZDT
-DTSTART:19741103T020000
-RDATE:19741103T020000
-RDATE:19891008T020000
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19750223T030000
-RDATE:19750223T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chatham.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chatham.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chatham.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,72 +1,73 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Chatham
 X-LIC-LOCATION:Pacific/Chatham
+BEGIN:STANDARD
+DTSTART:19570101T000000
+RDATE:19570101T000000
+TZNAME:CHAST
+TZOFFSETFROM:+121348
+TZOFFSETTO:+1245
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19741103T024500
+RDATE:19741103T024500
+RDATE:19891008T024500
+TZNAME:CHADT
 TZOFFSETFROM:+1245
 TZOFFSETTO:+1345
-TZNAME:CHADT
-DTSTART:19751026T024500
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19881029T140000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
+DTSTART:19750223T034500
+RDATE:19750223T034500
 TZNAME:CHAST
-DTSTART:19760307T034500
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19890304T140000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
-DTSTART:19900318T034500
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=3SU;UNTIL=20070317T140000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+1245
-TZOFFSETTO:+1345
+DTSTART:19751026T024500
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CHADT
-DTSTART:19901007T024500
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=20060930T140000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+1245
 TZOFFSETTO:+1345
-TZNAME:CHADT
-DTSTART:20070930T024500
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19760307T034500
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CHAST
 TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
-DTSTART:20080406T034500
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+121348
+DTSTART:19900318T034500
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CHAST
+TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
-DTSTART:19570101T000000
-RDATE:19570101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19901007T024500
+RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CHADT
 TZOFFSETFROM:+1245
 TZOFFSETTO:+1345
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070930T024500
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9
 TZNAME:CHADT
-DTSTART:19741103T024500
-RDATE:19741103T024500
-RDATE:19891008T024500
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20080406T034500
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CHAST
 TZOFFSETFROM:+1345
 TZOFFSETTO:+1245
-TZNAME:CHAST
-DTSTART:19750223T034500
-RDATE:19750223T034500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chuuk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chuuk.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chuuk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Pacific/Chuuk
+X-LIC-LOCATION:Pacific/Chuuk
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:CHUT
+TZOFFSETFROM:+100708
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Easter.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Easter.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Easter.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,163 +1,166 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Easter
 X-LIC-LOCATION:Pacific/Easter
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:EMT
+TZOFFSETFROM:-071744
+TZOFFSETTO:-071728
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320901T000000
+RDATE:19320901T000000
+TZNAME:EASST
+TZOFFSETFROM:-071728
 TZOFFSETTO:-0600
-TZNAME:EASST
-DTSTART:19701010T210000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19721015T040000Z
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420531T220000
+RDATE:19420531T220000
+RDATE:19460831T210000
+RDATE:19690329T210000
+RDATE:19700328T210000
+RDATE:19710313T210000
+TZNAME:EAST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:EAST
-DTSTART:19720311T210000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19810315T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420731T220000
+RDATE:19420731T220000
+RDATE:19681102T210000
+RDATE:19691122T210000
+RDATE:19730929T210000
+TZNAME:EASST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:EASST
-DTSTART:19741012T210000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19811011T040000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460714T220000
+RDATE:19460714T220000
+TZNAME:EASST
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EASST
-DTSTART:19821009T220000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19871011T040000Z
+TZOFFSETTO:-0600
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19470331T210000
+RDATE:19470331T210000
 TZNAME:EAST
-DTSTART:19830312T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19860309T030000Z
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19701010T210000
+RRULE:FREQ=YEARLY;UNTIL=19721015T040000Z;BYDAY=2SA;BYMONTH=10
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19720311T210000
+RRULE:FREQ=YEARLY;UNTIL=19810315T030000Z;BYDAY=2SA;BYMONTH=3
 TZNAME:EAST
-DTSTART:19880312T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19890312T030000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19741012T210000
+RRULE:FREQ=YEARLY;UNTIL=19811011T040000Z;BYDAY=2SA;BYMONTH=10
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19820313T210000
+RDATE:19820313T210000
+TZNAME:EAST
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:EAST
-DTSTART:19910309T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19960310T030000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
+DTSTART:19821009T220000
+RRULE:FREQ=YEARLY;UNTIL=19871011T040000Z;BYDAY=2SA;BYMONTH=10
 TZNAME:EASST
-DTSTART:19911012T220000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA;UNTIL=19971012T040000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EASST
-DTSTART:19991009T220000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SA
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19830312T220000
+RRULE:FREQ=YEARLY;UNTIL=19860309T030000Z;BYDAY=2SA;BYMONTH=3
+TZNAME:EAST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:EAST
-DTSTART:20000311T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=20070311T030000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19870411T220000
+RDATE:19870411T220000
+RDATE:19900317T220000
+RDATE:19970329T220000
+RDATE:19980314T220000
+RDATE:19990403T220000
+RDATE:20080329T220000
+RDATE:20090314T220000
+RDATE:20100403T220000
+TZNAME:EAST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:EAST
-DTSTART:20090314T220000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-071744
-TZOFFSETTO:-071728
-TZNAME:EMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
+DTSTART:19880312T220000
+RRULE:FREQ=YEARLY;UNTIL=19890312T030000Z;BYDAY=2SA;BYMONTH=3
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-071728
-TZOFFSETTO:-0600
+DTSTART:19881001T220000
+RDATE:19881001T220000
+RDATE:19891014T220000
+RDATE:19900915T220000
+RDATE:19980926T220000
 TZNAME:EASST
-DTSTART:19320901T000000
-RDATE:19320901T000000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
+DTSTART:19910309T220000
+RRULE:FREQ=YEARLY;UNTIL=19960310T030000Z;BYDAY=2SA;BYMONTH=3
 TZNAME:EAST
-DTSTART:19420531T220000
-RDATE:19420531T220000
-RDATE:19460831T210000
-RDATE:19690329T210000
-RDATE:19700328T210000
-RDATE:19710313T210000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
+DTSTART:19911012T220000
+RRULE:FREQ=YEARLY;UNTIL=19971012T040000Z;BYDAY=2SA;BYMONTH=10
 TZNAME:EASST
-DTSTART:19420731T220000
-RDATE:19420731T220000
-RDATE:19681102T210000
-RDATE:19691122T210000
-RDATE:19730929T210000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19991009T220000
+RRULE:FREQ=YEARLY;BYDAY=2SA;BYMONTH=10
+TZNAME:EASST
 TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:EASST
-DTSTART:19460714T220000
-RDATE:19460714T220000
+TZOFFSETTO:-0500
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
+DTSTART:20000311T220000
+RRULE:FREQ=YEARLY;UNTIL=20070311T030000Z;BYDAY=2SA;BYMONTH=3
 TZNAME:EAST
-DTSTART:19470331T210000
-RDATE:19470331T210000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
+DTSTART:20110312T220000
+RRULE:FREQ=YEARLY;BYDAY=2SA;BYMONTH=3
 TZNAME:EAST
-DTSTART:19820313T210000
-RDATE:19820313T210000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:EAST
-DTSTART:19870411T220000
-RDATE:19870411T220000
-RDATE:19900317T220000
-RDATE:19970329T220000
-RDATE:19980314T220000
-RDATE:19990403T220000
-RDATE:20080329T220000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EASST
-DTSTART:19881001T220000
-RDATE:19881001T220000
-RDATE:19891014T220000
-RDATE:19900915T220000
-RDATE:19980926T220000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Efate.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Efate.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Efate.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,45 +1,49 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Efate
 X-LIC-LOCATION:Pacific/Efate
 BEGIN:STANDARD
-TZOFFSETFROM:+1200
+DTSTART:19120113T000000
+RDATE:19120113T000000
+TZNAME:VUST
+TZOFFSETFROM:+111316
 TZOFFSETTO:+1100
-TZNAME:VUT
-DTSTART:19840325T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19910323T120000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19830925T000000
+RDATE:19830925T000000
+RDATE:19841023T000000
+RDATE:19921025T000000
+TZNAME:VUST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:VUST
-DTSTART:19850929T000000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19910928T130000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19840325T000000
+RRULE:FREQ=YEARLY;UNTIL=19910323T120000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=3
+TZNAME:VUT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:VUT
-DTSTART:19920126T000000
-RRULE:FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19930123T120000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+111316
-TZOFFSETTO:+1100
-TZNAME:VUT
-DTSTART:19120113T000000
-RDATE:19120113T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19850929T000000
+RRULE:FREQ=YEARLY;UNTIL=19910928T130000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=9
+TZNAME:VUST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:VUST
-DTSTART:19830925T000000
-RDATE:19830925T000000
-RDATE:19841023T000000
-RDATE:19921025T000000
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920126T000000
+RRULE:FREQ=YEARLY;UNTIL=19930123T120000Z;BYDAY=SU;BYMONTHDAY=23,24,25,26,2
+ 7,28,29;BYMONTH=1
+TZNAME:VUT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Enderbury.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Enderbury.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Enderbury.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Enderbury
 X-LIC-LOCATION:Pacific/Enderbury
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:PHOT
 TZOFFSETFROM:-112420
 TZOFFSETTO:-1200
-TZNAME:PHOT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19791001T000000
+RDATE:19791001T000000
+TZNAME:PHOT
 TZOFFSETFROM:-1200
 TZOFFSETTO:-1100
-TZNAME:PHOT
-DTSTART:19791001T000000
-RDATE:19791001T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19950101T000000
+RDATE:19950101T000000
+TZNAME:PHOT
 TZOFFSETFROM:-1100
 TZOFFSETTO:+1300
-TZNAME:PHOT
-DTSTART:19950101T000000
-RDATE:19950101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fakaofo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fakaofo.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fakaofo.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Fakaofo
 X-LIC-LOCATION:Pacific/Fakaofo
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:TKT
 TZOFFSETFROM:-112456
 TZOFFSETTO:-1000
-TZNAME:TKT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fiji.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fiji.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fiji.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,46 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Fiji
 X-LIC-LOCATION:Pacific/Fiji
+BEGIN:STANDARD
+DTSTART:19151026T000000
+RDATE:19151026T000000
+TZNAME:FJST
+TZOFFSETFROM:+115340
+TZOFFSETTO:+1200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19981101T020000
+RRULE:FREQ=YEARLY;UNTIL=19991106T140000Z;BYDAY=1SU;BYMONTH=11
+TZNAME:FJST
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:FJST
-DTSTART:19981101T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=19991106T140000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19990228T030000
+RRULE:FREQ=YEARLY;UNTIL=20000226T140000Z;BYDAY=-1SU;BYMONTH=2
+TZNAME:FJT
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:FJT
-DTSTART:19990228T030000
-RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=-1SU;UNTIL=20000226T140000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20091129T020000
+RDATE:20091129T020000
+RDATE:20101024T020000
+TZNAME:FJST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+115340
+DTSTART:20100328T030000
+RDATE:20100328T030000
+RDATE:20110306T030000
+TZNAME:FJT
+TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:FJT
-DTSTART:19151026T000000
-RDATE:19151026T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Funafuti.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Funafuti.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Funafuti.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Funafuti
 X-LIC-LOCATION:Pacific/Funafuti
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:TVT
 TZOFFSETFROM:+115652
 TZOFFSETTO:+1200
-TZNAME:TVT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Galapagos.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Galapagos.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Galapagos.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Galapagos
 X-LIC-LOCATION:Pacific/Galapagos
 BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:ECT
 TZOFFSETFROM:-055824
 TZOFFSETTO:-0500
-TZNAME:ECT
-DTSTART:19310101T000000
-RDATE:19310101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19860101T000000
+RDATE:19860101T000000
+TZNAME:GALT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:GALT
-DTSTART:19860101T000000
-RDATE:19860101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Gambier.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Gambier.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Gambier.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Gambier
 X-LIC-LOCATION:Pacific/Gambier
 BEGIN:STANDARD
+DTSTART:19121001T000000
+RDATE:19121001T000000
+TZNAME:GAMT
 TZOFFSETFROM:-085948
 TZOFFSETTO:-0900
-TZNAME:GAMT
-DTSTART:19121001T000000
-RDATE:19121001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guadalcanal.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guadalcanal.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guadalcanal.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Guadalcanal
 X-LIC-LOCATION:Pacific/Guadalcanal
 BEGIN:STANDARD
+DTSTART:19121001T000000
+RDATE:19121001T000000
+TZNAME:SBT
 TZOFFSETFROM:+103948
 TZOFFSETTO:+1100
-TZNAME:SBT
-DTSTART:19121001T000000
-RDATE:19121001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guam.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guam.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guam.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Guam
 X-LIC-LOCATION:Pacific/Guam
 BEGIN:STANDARD
-TZOFFSETFROM:-1421
-TZOFFSETTO:+0939
-TZNAME:LMT
-DTSTART:18441231T000000
-RDATE:18441231T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0939
-TZOFFSETTO:+1000
-TZNAME:GST
 DTSTART:19010101T000000
 RDATE:19010101T000000
+TZNAME:GST
+TZOFFSETFROM:+0939
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:ChST
 DTSTART:20001223T000000
 RDATE:20001223T000000
+TZNAME:ChST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Honolulu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Honolulu.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Honolulu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,39 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Honolulu
 X-LIC-LOCATION:Pacific/Honolulu
 BEGIN:STANDARD
+DTSTART:18960113T120000
+RDATE:18960113T120000
+TZNAME:HST
 TZOFFSETFROM:-103126
 TZOFFSETTO:-1030
-TZNAME:HST
-DTSTART:19000101T120000
-RDATE:19000101T120000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1030
-TZOFFSETTO:-0930
-TZNAME:HDT
+BEGIN:STANDARD
 DTSTART:19330430T020000
 RDATE:19330430T020000
-END:DAYLIGHT
+RDATE:19420209T020000
+TZNAME:HDT
+TZOFFSETFROM:-1030
+TZOFFSETTO:-0930
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19330521T120000
+RDATE:19330521T120000
+RDATE:19450930T020000
+TZNAME:HST
 TZOFFSETFROM:-0930
 TZOFFSETTO:-1030
-TZNAME:HST
-DTSTART:19330521T020000
-RDATE:19330521T020000
-RDATE:19450930T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1030
-TZOFFSETTO:-0930
-TZNAME:HWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0930
-TZOFFSETTO:-0930
-TZNAME:HPT
-DTSTART:19450814T133000
-RDATE:19450814T133000
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1030
-TZOFFSETTO:-1000
-TZNAME:HST
 DTSTART:19470608T020000
 RDATE:19470608T020000
+TZNAME:HST
+TZOFFSETFROM:-1030
+TZOFFSETTO:-1000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Johnston.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Johnston.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Johnston.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Johnston
 X-LIC-LOCATION:Pacific/Johnston
 BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:HST
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
-TZNAME:HST
-DTSTART:16010101T000000
-RDATE:16010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kiritimati.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kiritimati.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kiritimati.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Kiritimati
 X-LIC-LOCATION:Pacific/Kiritimati
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:LINT
 TZOFFSETFROM:-102920
 TZOFFSETTO:-1040
-TZNAME:LINT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19791001T000000
+RDATE:19791001T000000
+TZNAME:LINT
 TZOFFSETFROM:-1040
 TZOFFSETTO:-1000
-TZNAME:LINT
-DTSTART:19791001T000000
-RDATE:19791001T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19950101T000000
+RDATE:19950101T000000
+TZNAME:LINT
 TZOFFSETFROM:-1000
 TZOFFSETTO:+1400
-TZNAME:LINT
-DTSTART:19950101T000000
-RDATE:19950101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kosrae.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kosrae.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kosrae.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Kosrae
 X-LIC-LOCATION:Pacific/Kosrae
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:KOST
 TZOFFSETFROM:+105156
 TZOFFSETTO:+1100
-TZNAME:KOST
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19691001T000000
+RDATE:19691001T000000
+TZNAME:KOST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:KOST
-DTSTART:19691001T000000
-RDATE:19691001T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19990101T000000
+RDATE:19990101T000000
+TZNAME:KOST
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:KOST
-DTSTART:19990101T000000
-RDATE:19990101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kwajalein.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kwajalein.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kwajalein.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Kwajalein
 X-LIC-LOCATION:Pacific/Kwajalein
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:MHT
 TZOFFSETFROM:+110920
 TZOFFSETTO:+1100
-TZNAME:MHT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19691001T000000
+RDATE:19691001T000000
+TZNAME:KWAT
 TZOFFSETFROM:+1100
 TZOFFSETTO:-1200
-TZNAME:KWAT
-DTSTART:19691001T000000
-RDATE:19691001T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19930820T000000
+RDATE:19930820T000000
+TZNAME:MHT
 TZOFFSETFROM:-1200
 TZOFFSETTO:+1200
-TZNAME:MHT
-DTSTART:19930820T000000
-RDATE:19930820T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Majuro.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Majuro.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Majuro.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Majuro
 X-LIC-LOCATION:Pacific/Majuro
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:MHT
 TZOFFSETFROM:+112448
 TZOFFSETTO:+1100
-TZNAME:MHT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19691001T000000
+RDATE:19691001T000000
+TZNAME:MHT
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:MHT
-DTSTART:19691001T000000
-RDATE:19691001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Marquesas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Marquesas.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Marquesas.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Marquesas
 X-LIC-LOCATION:Pacific/Marquesas
 BEGIN:STANDARD
+DTSTART:19121001T000000
+RDATE:19121001T000000
+TZNAME:MART
 TZOFFSETFROM:-0918
 TZOFFSETTO:-0930
-TZNAME:MART
-DTSTART:19121001T000000
-RDATE:19121001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Midway.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Midway.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Midway.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Midway
 X-LIC-LOCATION:Pacific/Midway
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:NST
 TZOFFSETFROM:-114928
 TZOFFSETTO:-1100
-TZNAME:NST
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19560603T000000
+RDATE:19560603T000000
+TZNAME:NDT
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1000
-TZNAME:NDT
-DTSTART:19560603T000000
-RDATE:19560603T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19560902T000000
+RDATE:19560902T000000
+TZNAME:NST
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1100
-TZNAME:NST
-DTSTART:19560902T000000
-RDATE:19560902T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19670401T000000
+RDATE:19670401T000000
+TZNAME:BST
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1100
-TZNAME:BST
-DTSTART:19670401T000000
-RDATE:19670401T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19831130T000000
+RDATE:19831130T000000
+TZNAME:SST
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1100
-TZNAME:SST
-DTSTART:19831130T000000
-RDATE:19831130T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Nauru.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Nauru.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Nauru.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Nauru
 X-LIC-LOCATION:Pacific/Nauru
 BEGIN:STANDARD
+DTSTART:19210115T000000
+RDATE:19210115T000000
+TZNAME:NRT
 TZOFFSETFROM:+110740
 TZOFFSETTO:+1130
-TZNAME:NRT
-DTSTART:19210115T000000
-RDATE:19210115T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420315T000000
+RDATE:19420315T000000
+TZNAME:JST
 TZOFFSETFROM:+1130
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420315T000000
-RDATE:19420315T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19440815T000000
+RDATE:19440815T000000
+TZNAME:NRT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+1130
-TZNAME:NRT
-DTSTART:19440815T000000
-RDATE:19440815T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19790501T000000
+RDATE:19790501T000000
+TZNAME:NRT
 TZOFFSETFROM:+1130
 TZOFFSETTO:+1200
-TZNAME:NRT
-DTSTART:19790501T000000
-RDATE:19790501T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Niue.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Niue.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Niue.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,29 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Niue
 X-LIC-LOCATION:Pacific/Niue
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:NUT
 TZOFFSETFROM:-111940
 TZOFFSETTO:-1120
-TZNAME:NUT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:NUT
 TZOFFSETFROM:-1120
 TZOFFSETTO:-1130
-TZNAME:NUT
-DTSTART:19510101T000000
-RDATE:19510101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19781001T000000
+RDATE:19781001T000000
+TZNAME:NUT
 TZOFFSETFROM:-1130
 TZOFFSETTO:-1100
-TZNAME:NUT
-DTSTART:19781001T000000
-RDATE:19781001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Norfolk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Norfolk.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Norfolk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Norfolk
 X-LIC-LOCATION:Pacific/Norfolk
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:NMT
 TZOFFSETFROM:+111152
 TZOFFSETTO:+1112
-TZNAME:NMT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:NFT
 TZOFFSETFROM:+1112
 TZOFFSETTO:+1130
-TZNAME:NFT
-DTSTART:19510101T000000
-RDATE:19510101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Noumea.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Noumea.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Noumea.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,44 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Noumea
 X-LIC-LOCATION:Pacific/Noumea
+BEGIN:STANDARD
+DTSTART:19120113T000000
+RDATE:19120113T000000
+TZNAME:NCST
+TZOFFSETFROM:+110548
+TZOFFSETTO:+1100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19771204T000000
+RRULE:FREQ=YEARLY;UNTIL=19781202T130000Z;BYDAY=1SU;BYMONTH=12
+TZNAME:NCST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:NCST
-DTSTART:19771204T000000
-RRULE:FREQ=YEARLY;BYMONTH=12;BYDAY=1SU;UNTIL=19781202T130000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19780227T000000
+RRULE:FREQ=YEARLY;UNTIL=19790226T120000Z;BYMONTH=2
+TZNAME:NCT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:NCT
-DTSTART:19780227T000000
-RRULE:FREQ=YEARLY;UNTIL=19790226T120000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+110548
-TZOFFSETTO:+1100
-TZNAME:NCT
-DTSTART:19120113T000000
-RDATE:19120113T000000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19961201T020000
+RDATE:19961201T020000
+TZNAME:NCST
 TZOFFSETFROM:+1100
 TZOFFSETTO:+1200
-TZNAME:NCST
-DTSTART:19961201T020000
-RDATE:19961201T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19970302T030000
+RDATE:19970302T030000
+TZNAME:NCT
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1100
-TZNAME:NCT
-DTSTART:19970302T030000
-RDATE:19970302T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pago_Pago.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pago_Pago.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pago_Pago.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Pago_Pago
 X-LIC-LOCATION:Pacific/Pago_Pago
 BEGIN:STANDARD
-TZOFFSETFROM:+123712
-TZOFFSETTO:-112248
-TZNAME:LMT
-DTSTART:18790705T000000
-RDATE:18790705T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-112248
-TZOFFSETTO:-1130
-TZNAME:SAMT
 DTSTART:19110101T000000
 RDATE:19110101T000000
+TZNAME:SAMT
+TZOFFSETFROM:-112248
+TZOFFSETTO:-1130
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1130
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19500101T000000
 RDATE:19500101T000000
+TZNAME:NST
+TZOFFSETFROM:-1130
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:BST
 DTSTART:19670401T000000
 RDATE:19670401T000000
-END:STANDARD
-BEGIN:STANDARD
+TZNAME:BST
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1100
-TZNAME:SST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19831130T000000
 RDATE:19831130T000000
+TZNAME:SST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Palau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Palau.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Palau.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Palau
 X-LIC-LOCATION:Pacific/Palau
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:PWT
 TZOFFSETFROM:+085756
 TZOFFSETTO:+0900
-TZNAME:PWT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pitcairn.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pitcairn.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pitcairn.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Pitcairn
 X-LIC-LOCATION:Pacific/Pitcairn
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:PNT
 TZOFFSETFROM:-084020
 TZOFFSETTO:-0830
-TZNAME:PNT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19980427T000000
+RDATE:19980427T000000
+TZNAME:PST
 TZOFFSETFROM:-0830
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19980427T000000
-RDATE:19980427T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pohnpei.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pohnpei.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pohnpei.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Pacific/Pohnpei
+X-LIC-LOCATION:Pacific/Pohnpei
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:PONT
+TZOFFSETFROM:+103252
+TZOFFSETTO:+1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Ponape.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Ponape.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Ponape.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Ponape
 X-LIC-LOCATION:Pacific/Ponape
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:PONT
 TZOFFSETFROM:+103252
 TZOFFSETTO:+1100
-TZNAME:PONT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Port_Moresby.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Port_Moresby.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Port_Moresby.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,22 +1,23 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Port_Moresby
 X-LIC-LOCATION:Pacific/Port_Moresby
 BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:PMMT
 TZOFFSETFROM:+094840
 TZOFFSETTO:+094832
-TZNAME:PMMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:PGT
 TZOFFSETFROM:+094832
 TZOFFSETTO:+1000
-TZNAME:PGT
-DTSTART:18950101T000000
-RDATE:18950101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Rarotonga.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Rarotonga.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Rarotonga.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Rarotonga
 X-LIC-LOCATION:Pacific/Rarotonga
 BEGIN:STANDARD
-TZOFFSETFROM:-0930
-TZOFFSETTO:-1000
+DTSTART:19010101T000000
+RDATE:19010101T000000
 TZNAME:CKT
-DTSTART:19790304T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19910303T093000Z
+TZOFFSETFROM:-103904
+TZOFFSETTO:-1030
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
+DTSTART:19781112T000000
+RDATE:19781112T000000
+TZNAME:CKHST
+TZOFFSETFROM:-1030
 TZOFFSETTO:-0930
-TZNAME:CKHST
-DTSTART:19791028T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901028T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-103904
-TZOFFSETTO:-1030
+DTSTART:19790304T000000
+RRULE:FREQ=YEARLY;UNTIL=19910303T093000Z;BYDAY=1SU;BYMONTH=3
 TZNAME:CKT
-DTSTART:19010101T000000
-RDATE:19010101T000000
+TZOFFSETFROM:-0930
+TZOFFSETTO:-1000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1030
+DTSTART:19791028T000000
+RRULE:FREQ=YEARLY;UNTIL=19901028T100000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CKHST
+TZOFFSETFROM:-1000
 TZOFFSETTO:-0930
-TZNAME:CKHST
-DTSTART:19781112T000000
-RDATE:19781112T000000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Saipan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Saipan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Saipan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,36 +1,30 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Saipan
 X-LIC-LOCATION:Pacific/Saipan
 BEGIN:STANDARD
-TZOFFSETFROM:-1417
-TZOFFSETTO:+0943
-TZNAME:LMT
-DTSTART:18441231T000000
-RDATE:18441231T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0943
-TZOFFSETTO:+0900
-TZNAME:MPT
 DTSTART:19010101T000000
 RDATE:19010101T000000
+TZNAME:MPT
+TZOFFSETFROM:+0943
+TZOFFSETTO:+0900
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-TZNAME:MPT
 DTSTART:19691001T000000
 RDATE:19691001T000000
+TZNAME:MPT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-TZNAME:ChST
 DTSTART:20001223T000000
 RDATE:20001223T000000
+TZNAME:ChST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Samoa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Samoa.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Samoa.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Samoa
 X-LIC-LOCATION:Pacific/Samoa
 BEGIN:STANDARD
-TZOFFSETFROM:+123712
-TZOFFSETTO:-112248
-TZNAME:LMT
-DTSTART:18790705T000000
-RDATE:18790705T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-112248
-TZOFFSETTO:-1130
-TZNAME:SAMT
 DTSTART:19110101T000000
 RDATE:19110101T000000
+TZNAME:SAMT
+TZOFFSETFROM:-112248
+TZOFFSETTO:-1130
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1130
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19500101T000000
 RDATE:19500101T000000
+TZNAME:NST
+TZOFFSETFROM:-1130
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:BST
 DTSTART:19670401T000000
 RDATE:19670401T000000
-END:STANDARD
-BEGIN:STANDARD
+TZNAME:BST
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1100
-TZNAME:SST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19831130T000000
 RDATE:19831130T000000
+TZNAME:SST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tahiti.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tahiti.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tahiti.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Tahiti
 X-LIC-LOCATION:Pacific/Tahiti
 BEGIN:STANDARD
+DTSTART:19121001T000000
+RDATE:19121001T000000
+TZNAME:TAHT
 TZOFFSETFROM:-095816
 TZOFFSETTO:-1000
-TZNAME:TAHT
-DTSTART:19121001T000000
-RDATE:19121001T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tarawa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tarawa.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tarawa.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Tarawa
 X-LIC-LOCATION:Pacific/Tarawa
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:GILT
 TZOFFSETFROM:+113204
 TZOFFSETTO:+1200
-TZNAME:GILT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tongatapu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tongatapu.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tongatapu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,57 +1,58 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Tongatapu
 X-LIC-LOCATION:Pacific/Tongatapu
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1400
-TZNAME:TOST
-DTSTART:20001105T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU;UNTIL=20011103T130000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1400
-TZOFFSETTO:+1300
+DTSTART:19010101T000000
+RDATE:19010101T000000
 TZNAME:TOT
-DTSTART:20010128T020000
-RRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=-1SU;UNTIL=20020126T120000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+121920
 TZOFFSETTO:+1220
-TZNAME:TOT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19410101T000000
+RDATE:19410101T000000
+TZNAME:TOT
 TZOFFSETFROM:+1220
 TZOFFSETTO:+1300
-TZNAME:TOT
-DTSTART:19410101T000000
-RDATE:19410101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19990101T000000
+RDATE:19990101T000000
+TZNAME:TOST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19991007T020000
+RDATE:19991007T020000
+TZNAME:TOST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20000319T030000
+RDATE:20000319T030000
 TZNAME:TOT
-DTSTART:19990101T000000
-RDATE:19990101T000000
+TZOFFSETFROM:+1400
+TZOFFSETTO:+1300
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20001105T020000
+RRULE:FREQ=YEARLY;UNTIL=20011103T130000Z;BYDAY=1SU;BYMONTH=11
+TZNAME:TOST
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1400
-TZNAME:TOST
-DTSTART:19991007T020000
-RDATE:19991007T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20010128T020000
+RRULE:FREQ=YEARLY;UNTIL=20020126T120000Z;BYDAY=-1SU;BYMONTH=1
+TZNAME:TOT
 TZOFFSETFROM:+1400
 TZOFFSETTO:+1300
-TZNAME:TOT
-DTSTART:20000319T030000
-RDATE:20000319T030000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Truk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Truk.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Truk.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Truk
 X-LIC-LOCATION:Pacific/Truk
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:CHUT
 TZOFFSETFROM:+100708
 TZOFFSETTO:+1000
-TZNAME:TRUT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wake.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wake.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wake.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Wake
 X-LIC-LOCATION:Pacific/Wake
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:WAKT
 TZOFFSETFROM:+110628
 TZOFFSETTO:+1200
-TZNAME:WAKT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wallis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wallis.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wallis.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Wallis
 X-LIC-LOCATION:Pacific/Wallis
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:WFT
 TZOFFSETFROM:+121520
 TZOFFSETTO:+1200
-TZNAME:WFT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Yap.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Yap.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Yap.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,15 +1,16 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Pacific/Yap
 X-LIC-LOCATION:Pacific/Yap
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:CHUT
 TZOFFSETFROM:+100708
 TZOFFSETTO:+1000
-TZNAME:TRUT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Poland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Poland.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Poland.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,177 +1,190 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Poland
 X-LIC-LOCATION:Poland
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:WMT
+TZOFFSETFROM:+0124
+TZOFFSETTO:+0124
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19150805T000000
+RDATE:19150805T000000
+TZNAME:CEST
+TZOFFSETFROM:+0124
+TZOFFSETTO:+0100
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450429T000000
+RDATE:19460414T000000
+RDATE:19470504T020000
+RDATE:19480418T020000
+RDATE:19490410T020000
+RDATE:19570602T010000
+RDATE:19580330T010000
+RDATE:19590531T010000
+RDATE:19600403T010000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170917T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441004T020000
+RDATE:19451101T000000
+RDATE:19461007T030000
+RDATE:19770925T020000
+RDATE:19781001T020000
 TZNAME:CET
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19570929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T000000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19591004T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19611001T000000Z
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170416T020000
+RRULE:FREQ=YEARLY;UNTIL=19180415T010000Z;BYDAY=3MO;BYMONTH=4
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19610528T010000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=-1SU;UNTIL=19640531T000000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19180916T030000
+RDATE:19180916T030000
+TZNAME:EET
 TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19620930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19640927T000000Z
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
+DTSTART:19190415T020000
+RDATE:19190415T020000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19190916T030000
+RRULE:FREQ=YEARLY;UNTIL=19190916T000000Z;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19220601T000000
+RDATE:19220601T000000
 TZNAME:CEST
-DTSTART:19770403T010000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19870927T000000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400623T020000
+RDATE:19400623T020000
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19441001T000000
+RDATE:19441001T000000
 TZNAME:CEST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19870329T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19880327T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19880925T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0124
-TZOFFSETTO:+0124
-TZNAME:WMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0124
+DTSTART:19591004T020000
+RRULE:FREQ=YEARLY;UNTIL=19611001T000000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19150805T000000
-RDATE:19150805T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19610528T010000
+RRULE:FREQ=YEARLY;UNTIL=19640531T000000Z;BYDAY=-1SU;BYMONTH=5
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19160430T230000
-RDATE:19160430T230000
-RDATE:19400623T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450429T000000
-RDATE:19460414T000000
-RDATE:19470504T020000
-RDATE:19480418T020000
-RDATE:19490410T020000
-RDATE:19570602T010000
-RDATE:19580330T010000
-RDATE:19590531T010000
-RDATE:19600403T010000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19620930T020000
+RRULE:FREQ=YEARLY;UNTIL=19640927T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170917T030000
-RDATE:19220601T000000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441004T020000
-RDATE:19451101T000000
-RDATE:19461007T030000
-RDATE:19770925T020000
-RDATE:19781001T020000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19180916T030000
-RDATE:19180916T030000
+DTSTART:19770101T000000
+RDATE:19770101T000000
+RDATE:19880101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19190415T020000
-RDATE:19190415T020000
+DTSTART:19770403T010000
+RRULE:FREQ=YEARLY;UNTIL=19800406T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19190916T030000
-RDATE:19190916T030000
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19870927T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19870329T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19880327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:CEST
-DTSTART:19441001T000000
-RDATE:19441001T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+DTSTART:19880925T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:CET
-DTSTART:19770101T000000
-RDATE:19770101T000000
-RDATE:19880101T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Portugal.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Portugal.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Portugal.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,250 +1,261 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Portugal
 X-LIC-LOCATION:Portugal
 BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WEST
+TZOFFSETFROM:-003632
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160617T230000
+RDATE:19160617T230000
+RDATE:19170228T230000
+RDATE:19180301T230000
+RDATE:19190228T230000
+RDATE:19200229T230000
+RDATE:19210228T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+RDATE:19380326T230000
+RDATE:19390415T230000
+RDATE:19400224T230000
+RDATE:19410405T230000
+RDATE:19460406T230000
+RDATE:19770327T000000
+RDATE:19800330T000000
+RDATE:19830327T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161101T010000
+RDATE:19161101T010000
+RDATE:19241015T000000
+RDATE:19391119T000000
+RDATE:19461006T000000
+RDATE:19770925T010000
+RDATE:19781001T010000
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19171015T000000
+RRULE:FREQ=YEARLY;UNTIL=19211014T230000Z;BYMONTH=10
 TZNAME:WET
-DTSTART:19171015T000000
-RRULE:FREQ=YEARLY;UNTIL=19211014T230000Z
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291005T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19261003T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19291005T230000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;UNTIL=19321001T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19311004T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19321001T230000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;UNTIL=19381001T230000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19341007T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19381001T230000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411005T230000Z;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19401006T000000
-RRULE:FREQ=YEARLY;UNTIL=19411005T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420314T230000
+RRULE:FREQ=YEARLY;UNTIL=19450310T230000Z;BYDAY=2SA;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420425T230000
+RDATE:19420425T230000
+RDATE:19430417T230000
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420816T000000
+RDATE:19420816T000000
 TZNAME:WEST
-DTSTART:19420314T230000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SA;UNTIL=19450310T230000Z
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;UNTIL=19451027T230000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19421025T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19451027T230000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19430829T000000
+RRULE:FREQ=YEARLY;UNTIL=19450825T220000Z;BYDAY=SU;BYMONTHDAY=26,27,28,29,3
+ 0,31,32;BYMONTH=8
+TZNAME:WEST
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19430829T000000
-RRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=26,27,28,29,30,31;BYDAY=SU;UNTIL=19450825T220000Z
-RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=1;BYDAY=SU;UNTIL=19450825T220000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19440422T230000
+RRULE:FREQ=YEARLY;UNTIL=19450421T220000Z;BYDAY=SA;BYMONTHDAY=21,22,23,24,2
+ 5,26,27;BYMONTH=4
+TZNAME:WEMT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:WEMT
-DTSTART:19440422T230000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=21,22,23,24,25,26,27;BYDAY=SA;UNTIL=19450421T220000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;UNTIL=19490403T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19470406T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19490403T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T020000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T020000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;UNTIL=19650404T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19510401T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19650404T020000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;UNTIL=19651003T020000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19511007T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19651003T020000Z
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19660403T020000
+RDATE:19660403T020000
+TZNAME:CET
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19760926T010000
+RDATE:19760926T010000
 TZNAME:WEST
-DTSTART:19780402T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19790401T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19910929T010000Z
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;UNTIL=19790401T000000Z;BYDAY=1SU;BYMONTH=4
 TZNAME:WEST
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T010000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19840325T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19920329T010000Z
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19950326T010000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19820926T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19820328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19970330T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-003632
-TZOFFSETTO:-003632
-TZNAME:LMT
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-003632
+DTSTART:19830925T020000
+RRULE:FREQ=YEARLY;UNTIL=19910929T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19120101T000000
-RDATE:19120101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;UNTIL=19920329T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19160617T230000
-RDATE:19160617T230000
-RDATE:19170228T230000
-RDATE:19180301T230000
-RDATE:19190228T230000
-RDATE:19200229T230000
-RDATE:19210228T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19310418T230000
-RDATE:19320402T230000
-RDATE:19340407T230000
-RDATE:19350330T230000
-RDATE:19360418T230000
-RDATE:19370403T230000
-RDATE:19380326T230000
-RDATE:19390415T230000
-RDATE:19400224T230000
-RDATE:19410405T230000
-RDATE:19460406T230000
-RDATE:19770327T000000
-RDATE:19800330T000000
-RDATE:19830327T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19920927T020000
+RDATE:19920927T020000
+TZNAME:CET
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19161101T010000
-RDATE:19161101T010000
-RDATE:19241015T000000
-RDATE:19391119T000000
-RDATE:19461006T000000
-RDATE:19760926T010000
-RDATE:19770925T010000
-RDATE:19781001T010000
+TZOFFSETTO:+0100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-TZNAME:WEMT
-DTSTART:19420425T230000
-RDATE:19420425T230000
-RDATE:19430417T230000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T020000
+RDATE:19960331T020000
 TZNAME:WEST
-DTSTART:19420816T000000
-RDATE:19420816T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19660403T020000
-RDATE:19660403T020000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
 TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19920927T020000
-RDATE:19920927T020000
+TZOFFSETTO:+0000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
+DTSTART:19970330T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19960331T020000
-RDATE:19960331T020000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/ROC.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/ROC.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/ROC.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,86 +1,87 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:ROC
 X-LIC-LOCATION:ROC
+BEGIN:STANDARD
+DTSTART:18960101T000000
+RDATE:18960101T000000
+TZNAME:CST
+TZOFFSETFROM:+0806
+TZOFFSETTO:+0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19450501T000000
+RRULE:FREQ=YEARLY;UNTIL=19510430T160000Z;BYMONTH=5
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19450501T000000
-RRULE:FREQ=YEARLY;UNTIL=19510430T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19451001T000000
+RRULE:FREQ=YEARLY;UNTIL=19510930T150000Z;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19451001T000000
-RRULE:FREQ=YEARLY;UNTIL=19510930T150000Z
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19520301T000000
+RDATE:19520301T000000
+RDATE:19790630T000000
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19521101T000000
+RRULE:FREQ=YEARLY;UNTIL=19541031T150000Z;BYMONTH=11
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19521101T000000
-RRULE:FREQ=YEARLY;UNTIL=19541031T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19530401T000000
+RRULE:FREQ=YEARLY;UNTIL=19590331T160000Z;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19530401T000000
-RRULE:FREQ=YEARLY;UNTIL=19590331T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19551001T000000
+RRULE:FREQ=YEARLY;UNTIL=19610930T150000Z;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19551001T000000
-RRULE:FREQ=YEARLY;UNTIL=19610930T150000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19600601T000000
+RRULE:FREQ=YEARLY;UNTIL=19610531T160000Z;BYMONTH=6
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19600601T000000
-RRULE:FREQ=YEARLY;UNTIL=19610531T160000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19740401T000000
+RRULE:FREQ=YEARLY;UNTIL=19750331T160000Z;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19740401T000000
-RRULE:FREQ=YEARLY;UNTIL=19750331T160000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19741001T000000
+RRULE:FREQ=YEARLY;UNTIL=19750930T150000Z;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19741001T000000
-RRULE:FREQ=YEARLY;UNTIL=19750930T150000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0806
-TZOFFSETTO:+0800
+DTSTART:19790930T000000
+RDATE:19790930T000000
 TZNAME:CST
-DTSTART:18960101T000000
-RDATE:18960101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-TZNAME:CDT
-DTSTART:19520301T000000
-RDATE:19520301T000000
-RDATE:19800630T000000
-END:DAYLIGHT
-BEGIN:STANDARD
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
-TZNAME:CST
-DTSTART:19800930T000000
-RDATE:19800930T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/ROK.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/ROK.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/ROK.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,67 +1,68 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:ROK
 X-LIC-LOCATION:ROK
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-TZNAME:KDT
-DTSTART:19870510T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SU;UNTIL=19880507T150000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
+DTSTART:18900101T000000
+RDATE:18900101T000000
 TZNAME:KST
-DTSTART:19871011T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2SU;UNTIL=19881008T140000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+082752
 TZOFFSETTO:+0830
-TZNAME:KST
-DTSTART:18900101T000000
-RDATE:18900101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0830
-TZOFFSETTO:+0900
-TZNAME:KST
 DTSTART:19041201T000000
 RDATE:19041201T000000
 RDATE:19320101T000000
 RDATE:19681001T000000
+TZNAME:KST
+TZOFFSETFROM:+0830
+TZOFFSETTO:+0900
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:KST
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0830
-TZNAME:KST
-DTSTART:19280101T000000
-RDATE:19280101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-TZNAME:KST
 DTSTART:19540321T000000
 RDATE:19540321T000000
 RDATE:19600913T000000
+TZNAME:KST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19600515T000000
+RDATE:19600515T000000
+TZNAME:KDT
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0900
-TZNAME:KDT
-DTSTART:19600515T000000
-RDATE:19600515T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19610810T000000
+RDATE:19610810T000000
+TZNAME:KST
 TZOFFSETFROM:+0800
 TZOFFSETTO:+0830
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870510T000000
+RRULE:FREQ=YEARLY;UNTIL=19880507T150000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:KDT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871011T000000
+RRULE:FREQ=YEARLY;UNTIL=19881008T140000Z;BYDAY=2SU;BYMONTH=10
 TZNAME:KST
-DTSTART:19610810T000000
-RDATE:19610810T000000
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Singapore.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Singapore.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Singapore.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,71 +1,72 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Singapore
 X-LIC-LOCATION:Singapore
 BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:SMT
 TZOFFSETFROM:+065525
 TZOFFSETTO:+065525
-TZNAME:SMT
-DTSTART:19010101T000000
-RDATE:19010101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19050601T000000
+RDATE:19050601T000000
+TZNAME:MALT
 TZOFFSETFROM:+065525
 TZOFFSETTO:+0700
-TZNAME:MALT
-DTSTART:19050601T000000
-RDATE:19050601T000000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+TZNAME:MALST
 TZOFFSETFROM:+0700
 TZOFFSETTO:+0720
-TZNAME:MALST
-DTSTART:19330101T000000
-RDATE:19330101T000000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19360101T000000
+RDATE:19360101T000000
+TZNAME:MALT
 TZOFFSETFROM:+0720
 TZOFFSETTO:+0720
-TZNAME:MALT
-DTSTART:19360101T000000
-RDATE:19360101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19410901T000000
+RDATE:19410901T000000
+TZNAME:MALT
 TZOFFSETFROM:+0720
 TZOFFSETTO:+0730
-TZNAME:MALT
-DTSTART:19410901T000000
-RDATE:19410901T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420216T000000
+RDATE:19420216T000000
+TZNAME:JST
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0900
-TZNAME:JST
-DTSTART:19420216T000000
-RDATE:19420216T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19450912T000000
+RDATE:19450912T000000
+TZNAME:MALT
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0730
-TZNAME:MALT
-DTSTART:19450912T000000
-RDATE:19450912T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19650809T000000
+RDATE:19650809T000000
+TZNAME:SGT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0730
-TZNAME:SGT
-DTSTART:19650809T000000
-RDATE:19650809T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:SGT
 TZOFFSETFROM:+0730
 TZOFFSETTO:+0800
-TZNAME:SGT
-DTSTART:19820101T000000
-RDATE:19820101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Turkey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Turkey.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Turkey.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,139 +1,25 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:Turkey
 X-LIC-LOCATION:Turkey
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19241001T000000
-RRULE:FREQ=YEARLY;UNTIL=19250930T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19470420T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19480417T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19471005T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19501007T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19700503T000000
-RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19720506T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701004T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19721007T210000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19751026T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19761030T210000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19770403T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19780401T220000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:TRT
-DTSTART:19791015T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=11,12,13,14,15,16,17;BYDAY=MO;UNTIL=19821010T200000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:TRST
-DTSTART:19810329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19820328T000000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19860330T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900325T000000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19860928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900930T000000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19910331T010000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=20060325T230000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19910929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061028T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:20070325T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:20071028T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:IMT
 TZOFFSETFROM:+015552
 TZOFFSETTO:+015656
-TZNAME:IMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19101001T000000
+RDATE:19101001T000000
+TZNAME:EEST
 TZOFFSETFROM:+015656
 TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19101001T000000
-RDATE:19101001T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
 DTSTART:19160501T000000
 RDATE:19160501T000000
 RDATE:19200328T000000
@@ -155,11 +41,11 @@
 RDATE:19740331T020000
 RDATE:19750330T000000
 RDATE:19760601T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19161001T000000
 RDATE:19161001T000000
 RDATE:19201025T000000
@@ -177,43 +63,174 @@
 RDATE:19741103T050000
 RDATE:19771016T000000
 RDATE:19850928T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19241001T000000
+RRULE:FREQ=YEARLY;UNTIL=19250930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19470420T000000
+RRULE:FREQ=YEARLY;UNTIL=19480417T220000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19471005T000000
+RRULE:FREQ=YEARLY;UNTIL=19501007T210000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:EET
 TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:TRST
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19700503T000000
+RRULE:FREQ=YEARLY;UNTIL=19720506T220000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19701004T000000
+RRULE:FREQ=YEARLY;UNTIL=19721007T210000Z;BYDAY=SU;BYMONTHDAY=2,3,4,5,6,7,8
+ ;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19751026T000000
+RRULE:FREQ=YEARLY;UNTIL=19761030T210000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T000000
+RRULE:FREQ=YEARLY;UNTIL=19780401T220000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19781015T000000
 RDATE:19781015T000000
-RDATE:19800406T030000
-RDATE:19830731T000000
-END:DAYLIGHT
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19790401T030000
+RDATE:19790401T030000
+TZNAME:TRST
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0400
-TZNAME:TRST
-DTSTART:19790401T030000
-RDATE:19790401T030000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19791015T000000
+RRULE:FREQ=YEARLY;UNTIL=19821010T200000Z;BYDAY=-3MO;BYMONTH=10
+TZNAME:TRT
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:TRT
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800406T030000
+RRULE:FREQ=YEARLY;UNTIL=19800406T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19810329T030000
+RRULE:FREQ=YEARLY;UNTIL=19820328T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19830731T000000
+RDATE:19830731T000000
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19831002T000000
 RDATE:19831002T000000
+TZNAME:TRT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19850420T000000
+RDATE:19850420T000000
+TZNAME:EEST
 TZOFFSETFROM:+0300
 TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19860330T020000
+RRULE:FREQ=YEARLY;UNTIL=19900325T000000Z;BYDAY=-1SU;BYMONTH=3
 TZNAME:EEST
-DTSTART:19850420T000000
-RDATE:19850420T000000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19860928T030000
+RRULE:FREQ=YEARLY;UNTIL=19900930T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19910331T010000
+RRULE:FREQ=YEARLY;UNTIL=20060325T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
 TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910929T020000
+RRULE:FREQ=YEARLY;UNTIL=19950923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
 TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061028T230000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:20070101T000000
 RDATE:20070101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070325T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071028T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/UCT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/UCT.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/UCT.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:UCT
+X-LIC-LOCATION:UCT
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:UCT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Alaska.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Alaska.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Alaska.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,137 +1,137 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Alaska
 X-LIC-LOCATION:US/Alaska
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:AHDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T120000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-TZNAME:AHST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T110000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:AHDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T120000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19840429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T110000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:19841028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T100000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T110000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-TZNAME:AKDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-TZNAME:AKST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+140024
-TZOFFSETTO:-095936
-TZNAME:LMT
-DTSTART:18671018T000000
-RDATE:18671018T000000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:CAT
 TZOFFSETFROM:-095936
 TZOFFSETTO:-1000
-TZNAME:CAT
-DTSTART:19000820T120000
-RDATE:19000820T120000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+TZNAME:CAT/CAWT
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
-TZNAME:CAT
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CAT/CAWT
 TZOFFSETFROM:-1000
 TZOFFSETTO:-0900
-TZNAME:CAWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T140000
+RDATE:19450814T140000
+TZNAME:CAT/CAPT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
-TZNAME:CAPT
-DTSTART:19450814T140000
-RDATE:19450814T140000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:CAT/CAPT
 TZOFFSETFROM:-0900
 TZOFFSETTO:-1000
-TZNAME:CAT
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:CAT
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
-TZNAME:AHST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19670401T000000
 RDATE:19670401T000000
 RDATE:19690101T000000
+TZNAME:AHST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T120000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:AHDT
 TZOFFSETFROM:-1000
 TZOFFSETTO:-0900
-TZNAME:AHDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19821031T110000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AHST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19740106T020000
 RDATE:19740106T020000
 RDATE:19750223T020000
+TZNAME:AHDT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T120000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:AHDT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19831030T020000
+RDATE:19831030T020000
+TZNAME:YST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
-TZNAME:YST
-DTSTART:19831030T020000
-RDATE:19831030T020000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19831130T000000
+RDATE:19831130T000000
+TZNAME:AKST
 TZOFFSETFROM:-0900
 TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T110000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T100000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:AKST
-DTSTART:19831130T000000
-RDATE:19831130T000000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T110000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:AKDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AKST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Aleutian.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Aleutian.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Aleutian.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,137 +1,131 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Aleutian
 X-LIC-LOCATION:US/Aleutian
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:BDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T130000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-TZNAME:BST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19821031T120000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:BDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19830424T130000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:HADT
-DTSTART:19840429T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T120000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-TZNAME:HAST
-DTSTART:19841028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T110000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:HADT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T120000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-TZNAME:HADT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-TZNAME:HAST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+121321
-TZOFFSETTO:-114638
-TZNAME:LMT
-DTSTART:18671018T000000
-RDATE:18671018T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-114638
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19000820T120000
 RDATE:19000820T120000
+TZNAME:NST
+TZOFFSETFROM:-114638
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19420101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
+TZNAME:NST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-TZNAME:NWT
 DTSTART:19420209T020000
 RDATE:19420209T020000
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-TZNAME:NPT
 DTSTART:19450814T130000
 RDATE:19450814T130000
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19450930T020000
 RDATE:19450930T020000
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:BST
 DTSTART:19670401T000000
 RDATE:19670401T000000
 RDATE:19690101T000000
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T130000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:BDT
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1000
-TZNAME:BDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19821031T120000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:BST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:19740106T020000
 RDATE:19740106T020000
 RDATE:19750223T020000
+TZNAME:BDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-1000
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T130000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:BDT
+TZOFFSETFROM:-1100
 TZOFFSETTO:-1000
-TZNAME:AHST
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19831030T020000
 RDATE:19831030T020000
+TZNAME:AHST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19831130T000000
+RDATE:19831130T000000
+TZNAME:HAST
 TZOFFSETFROM:-1000
 TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T120000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:HADT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19841028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T110000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:HAST
-DTSTART:19831130T000000
-RDATE:19831130T000000
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T120000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:HADT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:HADT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:HAST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Arizona.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Arizona.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Arizona.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,61 +1,68 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Arizona
 X-LIC-LOCATION:US/Arizona
+BEGIN:STANDARD
+DTSTART:18831118T113142
+RDATE:18831118T113142
+TZNAME:MST
+TZOFFSETFROM:-072818
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T080000Z
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-072818
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:18831118T113142
-RDATE:18831118T113142
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-RDATE:19440401T000100
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-TZNAME:MST
 DTSTART:19440101T000100
 RDATE:19440101T000100
 RDATE:19441001T000100
 RDATE:19671029T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19440401T000100
+RDATE:19440401T000100
+TZNAME:MST
 TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19670101T000000
 RDATE:19670101T000000
 RDATE:19680321T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RDATE:19670430T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19670430T020000
-RDATE:19670430T020000
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Central.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Central.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Central.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,155 +1,177 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Central
 X-LIC-LOCATION:US/Central
+BEGIN:STANDARD
+DTSTART:18831118T120924
+RDATE:18831118T120924
+TZNAME:CST
+TZOFFSETFROM:-055036
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
 TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19211030T070000Z
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200613T020000
+RDATE:19200613T020000
+RDATE:19210327T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19220430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19350428T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19201031T020000
+RRULE:FREQ=YEARLY;UNTIL=19211030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19220924T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19350929T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19220430T020000
+RRULE:FREQ=YEARLY;UNTIL=19350428T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19370425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19220924T020000
+RRULE:FREQ=YEARLY;UNTIL=19350929T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19360301T020000
+RDATE:19360301T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19361115T020000
+RDATE:19361115T020000
+RDATE:19450930T020000
 TZNAME:CST
-DTSTART:19370926T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19370425T020000
+RRULE:FREQ=YEARLY;UNTIL=19410427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19370926T020000
+RRULE:FREQ=YEARLY;UNTIL=19410928T070000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:CST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-055036
-TZOFFSETTO:-0600
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:18831118T120924
-RDATE:18831118T120924
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19200613T020000
-RDATE:19200613T020000
-RDATE:19210327T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19360301T020000
-RDATE:19360301T020000
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19361115T020000
-RDATE:19361115T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/East-Indiana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/East-Indiana.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/East-Indiana.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,141 +1,142 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/East-Indiana
 X-LIC-LOCATION:US/East-Indiana
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:18831118T121522
+RDATE:18831118T121522
+TZNAME:CST
+TZOFFSETFROM:-054438
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19540425T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:CST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
-END:STANDARD
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19700426T070000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19701025T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-054438
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T121522
-RDATE:18831118T121522
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19200101T000000
 RDATE:19200101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19410622T020000
+RDATE:19410622T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19410622T020000
-RDATE:19410622T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
 DTSTART:19410928T020000
 RDATE:19410928T020000
 RDATE:19450930T020000
 RDATE:19570929T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19550424T020000
 RDATE:19550424T020000
 RDATE:19580427T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19690101T000000
 RDATE:19690101T000000
 RDATE:19710101T000000
 RDATE:20060101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19700426T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19701025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
 DTSTART:20060402T020000
 RDATE:20060402T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20061029T020000
+RDATE:20061029T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
 TZNAME:EST
-DTSTART:20061029T020000
-RDATE:20061029T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Eastern.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Eastern.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Eastern.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,131 +1,148 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Eastern
 X-LIC-LOCATION:US/Eastern
+BEGIN:STANDARD
+DTSTART:18831118T120358
+RDATE:18831118T120358
+TZNAME:EST
+TZOFFSETFROM:-045602
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T070000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19200328T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
 TZNAME:EST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T060000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200328T020000
+RDATE:19200328T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19210424T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19450930T020000
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19210424T020000
+RRULE:FREQ=YEARLY;UNTIL=19410427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;UNTIL=19410928T060000Z;BYDAY=-1SU;BYMONTH=9
 TZNAME:EST
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T060000Z
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:EWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-045602
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:18831118T120358
-RDATE:18831118T120358
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19450930T020000
-RDATE:19450930T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Hawaii.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Hawaii.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Hawaii.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,51 +1,39 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Hawaii
 X-LIC-LOCATION:US/Hawaii
 BEGIN:STANDARD
+DTSTART:18960113T120000
+RDATE:18960113T120000
+TZNAME:HST
 TZOFFSETFROM:-103126
 TZOFFSETTO:-1030
-TZNAME:HST
-DTSTART:19000101T120000
-RDATE:19000101T120000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1030
-TZOFFSETTO:-0930
-TZNAME:HDT
+BEGIN:STANDARD
 DTSTART:19330430T020000
 RDATE:19330430T020000
-END:DAYLIGHT
+RDATE:19420209T020000
+TZNAME:HDT
+TZOFFSETFROM:-1030
+TZOFFSETTO:-0930
+END:STANDARD
 BEGIN:STANDARD
+DTSTART:19330521T120000
+RDATE:19330521T120000
+RDATE:19450930T020000
+TZNAME:HST
 TZOFFSETFROM:-0930
 TZOFFSETTO:-1030
-TZNAME:HST
-DTSTART:19330521T020000
-RDATE:19330521T020000
-RDATE:19450930T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-1030
-TZOFFSETTO:-0930
-TZNAME:HWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0930
-TZOFFSETTO:-0930
-TZNAME:HPT
-DTSTART:19450814T133000
-RDATE:19450814T133000
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-1030
-TZOFFSETTO:-1000
-TZNAME:HST
 DTSTART:19470608T020000
 RDATE:19470608T020000
+TZNAME:HST
+TZOFFSETFROM:-1030
+TZOFFSETTO:-1000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Indiana-Starke.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Indiana-Starke.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Indiana-Starke.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,165 +1,166 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Indiana-Starke
 X-LIC-LOCATION:US/Indiana-Starke
+BEGIN:STANDARD
+DTSTART:18831118T121330
+RDATE:18831118T121330
+TZNAME:CST
+TZOFFSETFROM:-054630
+TZOFFSETTO:-0600
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T080000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CWT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19610430T080000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19631027T020000
+RDATE:20061029T020000
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19470101T000000
+RDATE:19470101T000000
 TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19610430T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19470928T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T070000Z
+RRULE:FREQ=YEARLY;UNTIL=19540926T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19561028T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19561028T070000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19570929T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19580928T070000Z
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19591025T020000
+RRULE:FREQ=YEARLY;UNTIL=19611029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19591025T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19611029T070000Z
 END:STANDARD
+BEGIN:STANDARD
+DTSTART:19620429T020000
+RDATE:19620429T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19670430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T080000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19901028T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19901028T070000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19910407T080000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19910407T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19911027T020000
+RDATE:19911027T020000
+TZNAME:EST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-054630
-TZOFFSETTO:-0600
+DTSTART:20060402T020000
+RDATE:20060402T020000
 TZNAME:CST
-DTSTART:18831118T121330
-RDATE:18831118T121330
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:19631027T020000
-RDATE:20061029T020000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19470101T000000
-RDATE:19470101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19620429T020000
-RDATE:19620429T020000
-END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19911027T020000
-RDATE:19911027T020000
+TZOFFSETTO:-0600
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:20060402T020000
-RDATE:20060402T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Michigan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Michigan.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Michigan.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,101 +1,115 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Michigan
 X-LIC-LOCATION:US/Michigan
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19731028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:19050101T000000
+RDATE:19050101T000000
+TZNAME:CST
 TZOFFSETFROM:-053211
 TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:19050101T000000
-RDATE:19050101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19150515T020000
+RDATE:19150515T020000
+TZNAME:EST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19150515T020000
-RDATE:19150515T020000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19420101T000000
 RDATE:19420101T000000
 RDATE:19460101T000000
 RDATE:19730101T000000
 RDATE:19750101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:EWT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
-TZNAME:EWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0400
-TZNAME:EPT
-DTSTART:19450814T190000
-RDATE:19450814T190000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
 DTSTART:19450930T020000
 RDATE:19450930T020000
 RDATE:19480926T020000
 RDATE:19671029T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
 DTSTART:19480425T020000
 RDATE:19480425T020000
 RDATE:19670614T020000
 RDATE:19730429T020000
 RDATE:19740106T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19731028T020000
+RRULE:FREQ=YEARLY;UNTIL=19741027T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19750427T020000
 RDATE:19750427T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Mountain.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Mountain.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Mountain.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,111 +1,134 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Mountain
 X-LIC-LOCATION:US/Mountain
+BEGIN:STANDARD
+DTSTART:18831118T120004
+RDATE:18831118T120004
+TZNAME:MST
+TZOFFSETFROM:-065956
+TZOFFSETTO:-0700
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19210327T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
 TZNAME:MST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T080000Z
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19200328T020000
+RRULE:FREQ=YEARLY;UNTIL=19210327T090000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19650425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T090000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19210522T020000
+RDATE:19450930T020000
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19651031T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T080000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:MWT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T090000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19650425T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19651031T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-065956
-TZOFFSETTO:-0700
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
 TZNAME:MST
-DTSTART:18831118T120004
-RDATE:18831118T120004
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19210522T020000
-RDATE:19210522T020000
-RDATE:19450930T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
-TZNAME:MPT
-DTSTART:19450814T170000
-RDATE:19450814T170000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZNAME:MDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Pacific.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Pacific.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Pacific.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,117 +1,132 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Pacific
 X-LIC-LOCATION:US/Pacific
+BEGIN:STANDARD
+DTSTART:18831118T120702
+RDATE:18831118T120702
+TZNAME:PST
+TZOFFSETFROM:-075258
+TZOFFSETTO:-0800
+END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T100000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19180331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19190330T100000Z
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19191026T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:PWT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19500430T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T100000Z
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19490101T020000
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19500924T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19610924T090000Z
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0700
+DTSTART:19460101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T090000Z
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19480314T020000
+RDATE:19480314T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T100000Z
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
+DTSTART:19500430T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T100000Z;BYDAY=-1SU;BYMONTH=4
 TZNAME:PDT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T100000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PDT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19500924T020000
+RRULE:FREQ=YEARLY;UNTIL=19610924T090000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-075258
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:18831118T120702
-RDATE:18831118T120702
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
-TZNAME:PWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:PPT
-DTSTART:19450814T160000
-RDATE:19450814T160000
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:19490101T020000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-TZNAME:PST
-DTSTART:19460101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
-END:STANDARD
+TZOFFSETTO:-0700
+END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
 TZOFFSETFROM:-0800
 TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
 TZNAME:PDT
-DTSTART:19480314T020000
-RDATE:19480314T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Samoa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Samoa.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Samoa.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,43 +1,37 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:US/Samoa
 X-LIC-LOCATION:US/Samoa
 BEGIN:STANDARD
-TZOFFSETFROM:+123712
-TZOFFSETTO:-112248
-TZNAME:LMT
-DTSTART:18790705T000000
-RDATE:18790705T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-112248
-TZOFFSETTO:-1130
-TZNAME:SAMT
 DTSTART:19110101T000000
 RDATE:19110101T000000
+TZNAME:SAMT
+TZOFFSETFROM:-112248
+TZOFFSETTO:-1130
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1130
-TZOFFSETTO:-1100
-TZNAME:NST
 DTSTART:19500101T000000
 RDATE:19500101T000000
+TZNAME:NST
+TZOFFSETFROM:-1130
+TZOFFSETTO:-1100
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-TZNAME:BST
 DTSTART:19670401T000000
 RDATE:19670401T000000
-END:STANDARD
-BEGIN:STANDARD
+TZNAME:BST
 TZOFFSETFROM:-1100
 TZOFFSETTO:-1100
-TZNAME:SST
+END:STANDARD
+BEGIN:STANDARD
 DTSTART:19831130T000000
 RDATE:19831130T000000
+TZNAME:SST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/UTC.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/UTC.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/UTC.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:UTC
+X-LIC-LOCATION:UTC
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:UTC
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Universal.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Universal.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Universal.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Universal
+X-LIC-LOCATION:Universal
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:UTC
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/W-SU.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/W-SU.ics	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/W-SU.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1,167 +1,168 @@
 BEGIN:VCALENDAR
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:W-SU
 X-LIC-LOCATION:W-SU
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z
-END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19900929T230000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19900324T230000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950923T230000Z
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
 TZOFFSETFROM:+023020
 TZOFFSETTO:+0230
-TZNAME:MMT
-DTSTART:18800101T000000
-RDATE:18800101T000000
 END:STANDARD
 BEGIN:STANDARD
+DTSTART:19160703T000000
+RDATE:19160703T000000
+TZNAME:S
 TZOFFSETFROM:+0230
 TZOFFSETTO:+023048
-TZNAME:MMT
-DTSTART:19160703T000000
-RDATE:19160703T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19170701T230000
+RDATE:19170701T230000
+TZNAME:MST
 TZOFFSETFROM:+023048
 TZOFFSETTO:+033048
-TZNAME:MST
-DTSTART:19170701T230000
-RDATE:19170701T230000
 END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:19171228T000000
+RDATE:19171228T000000
+TZNAME:MMT
 TZOFFSETFROM:+033048
 TZOFFSETTO:+023048
-TZNAME:MMT
-DTSTART:19171228T000000
-RDATE:19171228T000000
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19180531T220000
+RDATE:19180531T220000
+TZNAME:MDST
 TZOFFSETFROM:+023048
 TZOFFSETTO:+043048
-TZNAME:MDST
-DTSTART:19180531T220000
-RDATE:19180531T220000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19180916T010000
+RDATE:19180916T010000
+TZNAME:MST
 TZOFFSETFROM:+043048
 TZOFFSETTO:+033048
-TZNAME:MST
-DTSTART:19180916T010000
-RDATE:19180916T010000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19190531T230000
+RDATE:19190531T230000
+TZNAME:MDST
 TZOFFSETFROM:+033048
 TZOFFSETTO:+043048
-TZNAME:MDST
-DTSTART:19190531T230000
-RDATE:19190531T230000
 END:DAYLIGHT
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19190701T020000
+RDATE:19190701T020000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+043048
 TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19190701T020000
-RDATE:19190701T020000
-END:DAYLIGHT
+END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-TZNAME:MSK
 DTSTART:19190816T000000
 RDATE:19190816T000000
 RDATE:19211001T000000
 RDATE:19920926T230000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-TZNAME:MSD
 DTSTART:19210214T230000
 RDATE:19210214T230000
 RDATE:19920328T230000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19210320T230000
+RDATE:19210320T230000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0400
 TZOFFSETTO:+0500
-TZNAME:MSD
-DTSTART:19210320T230000
-RDATE:19210320T230000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
+DTSTART:19210901T000000
+RDATE:19210901T000000
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0500
 TZOFFSETTO:+0400
-TZNAME:MSD
-DTSTART:19210901T000000
-RDATE:19210901T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
 DTSTART:19221001T000000
 RDATE:19221001T000000
 RDATE:19910929T030000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:MSK
 DTSTART:19300621T000000
 RDATE:19300621T000000
 RDATE:19920119T020000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T210000Z;BYMONTH=4
+TZNAME:MSK/MSD
 TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T200000Z;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
 TZOFFSETTO:+0300
-TZNAME:EEST
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
 DTSTART:19910331T020000
 RDATE:19910331T020000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
 END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/WET.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/WET.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/WET.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,52 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:WET
+X-LIC-LOCATION:WET
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T010000
+RRULE:FREQ=YEARLY;UNTIL=19800406T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19770925T020000
+RDATE:19770925T020000
+RDATE:19781001T020000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Zulu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Zulu.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Zulu.ics	2011-02-18 02:43:37 UTC (rev 7043)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Zulu
+X-LIC-LOCATION:Zulu
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:UTC
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/version.txt
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/version.txt	2011-02-18 02:25:07 UTC (rev 7042)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/version.txt	2011-02-18 02:43:37 UTC (rev 7043)
@@ -1 +1 @@
-Olson data source: tzdata2008i
+Olson data source: tzdata2011b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110217/22626e39/attachment-0001.html>