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

Thu Oct 6 04:06:13 PDT 2011

Revision: 8149
          http://trac.macosforge.org/projects/calendarserver/changeset/8149
Author:   cdaboo at apple.com
Date:     2011-10-06 04:06:10 -0700 (Thu, 06 Oct 2011)
Log Message:
-----------
Update to Olson 2011k 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/Bahia_Banderas.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/Matamoros.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/Beulah.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/Ojinaga.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/Santa_Isabel.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/Macquarie.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/Kathmandu.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/Novokuznetsk.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/CET.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/CST6CDT.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/EET.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/EST.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/EST5EDT.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Egypt.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Eire.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+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/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/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/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/MET.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/MST.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/MST7MDT.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/PST8PDT.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/Chuuk.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/Pohnpei.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/UCT.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/UTC.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Universal.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/W-SU.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/WET.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Zulu.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/links.txt
    CalendarServer/trunk/twistedcaldav/zoneinfo/timezones.xml
    CalendarServer/trunk/twistedcaldav/zoneinfo/version.txt

Added Paths:
-----------
    CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Juba.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kralendijk.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lower_Princes.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Metlakatla.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/America/Sitka.ics
    CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hebron.ics

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Abidjan.ics
===================================================================

--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Abidjan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Abidjan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Abidjan
+X-LIC-LOCATION:Africa/Abidjan
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
+TZOFFSETFROM:-001608
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Accra.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Accra.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Accra.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19361231T000000
-RRULE:FREQ=YEARLY;UNTIL=19421230T234000Z;BYMONTH=12
-TZNAME:GMT
-TZOFFSETFROM:+0020
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19361231T000000
+RRULE:FREQ=YEARLY;UNTIL=19421230T234000Z;BYMONTH=12
+TZNAME:GMT
+TZOFFSETFROM:+0020
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Addis_Ababa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Addis_Ababa.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Addis_Ababa.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19360505T000000
-RDATE:19360505T000000
-TZNAME:EAT
-TZOFFSETFROM:+023520
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Addis_Ababa
+X-LIC-LOCATION:Africa/Addis_Ababa
+BEGIN:STANDARD
+DTSTART:18700101T000000
+RDATE:18700101T000000
+TZNAME:ADMT
+TZOFFSETFROM:+023448
+TZOFFSETTO:+023520
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19360505T000000
+RDATE:19360505T000000
+TZNAME:EAT
+TZOFFSETFROM:+023520
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Algiers.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Algiers.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Algiers.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,112 +1,112 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Africa/Algiers
-X-LIC-LOCATION:Africa/Algiers
-BEGIN:STANDARD
-DTSTART:18910315T000100
-RDATE:18910315T000100
-TZNAME:PMT
-TZOFFSETFROM:+001212
-TZOFFSETTO:+000921
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110311T000000
-RDATE:19110311T000000
-TZNAME:WEST
-TZOFFSETFROM:+000921
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160614T230000
-RDATE:19160614T230000
-RDATE:19170324T230000
-RDATE:19180309T230000
-RDATE:19190301T230000
-RDATE:19200214T230000
-RDATE:19210314T230000
-RDATE:19390911T230000
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19201024T000000
-RDATE:19201024T000000
-RDATE:19210622T000000
-RDATE:19391119T010000
-RDATE:19461007T000000
-RDATE:19710927T000000
-RDATE:19801031T020000
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19400225T020000
-RDATE:19400225T020000
-TZNAME:CEST
-TZOFFSETFROM:+0000
-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: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:+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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Algiers
+X-LIC-LOCATION:Africa/Algiers
+BEGIN:STANDARD
+DTSTART:18910315T000100
+RDATE:18910315T000100
+TZNAME:PMT
+TZOFFSETFROM:+001212
+TZOFFSETTO:+000921
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110311T000000
+RDATE:19110311T000000
+TZNAME:WEST
+TZOFFSETFROM:+000921
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160614T230000
+RDATE:19160614T230000
+RDATE:19170324T230000
+RDATE:19180309T230000
+RDATE:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19390911T230000
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19201024T000000
+RDATE:19201024T000000
+RDATE:19210622T000000
+RDATE:19391119T010000
+RDATE:19461007T000000
+RDATE:19710927T000000
+RDATE:19801031T020000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400225T020000
+RDATE:19400225T020000
+TZNAME:CEST
+TZOFFSETFROM:+0000
+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: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:+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
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmara.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmara.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmara.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:ADMT
-TZOFFSETFROM:+023532
-TZOFFSETTO:+023520
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19360505T000000
-RDATE:19360505T000000
-TZNAME:EAT
-TZOFFSETFROM:+023520
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Asmara
+X-LIC-LOCATION:Africa/Asmara
+BEGIN:STANDARD
+DTSTART:18700101T000000
+RDATE:18700101T000000
+TZNAME:AMT
+TZOFFSETFROM:+023532
+TZOFFSETTO:+023532
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:ADMT
+TZOFFSETFROM:+023532
+TZOFFSETTO:+023520
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19360505T000000
+RDATE:19360505T000000
+TZNAME:EAT
+TZOFFSETFROM:+023520
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmera.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmera.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Asmera.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:ADMT
-TZOFFSETFROM:+023532
-TZOFFSETTO:+023520
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19360505T000000
-RDATE:19360505T000000
-TZNAME:EAT
-TZOFFSETFROM:+023520
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Asmera
+X-LIC-LOCATION:Africa/Asmera
+BEGIN:STANDARD
+DTSTART:18700101T000000
+RDATE:18700101T000000
+TZNAME:AMT
+TZOFFSETFROM:+023532
+TZOFFSETTO:+023532
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:ADMT
+TZOFFSETFROM:+023532
+TZOFFSETTO:+023520
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19360505T000000
+RDATE:19360505T000000
+TZNAME:EAT
+TZOFFSETFROM:+023520
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bamako.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bamako.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bamako.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19340226T000000
-RDATE:19340226T000000
-TZNAME:WAT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19600620T000000
-RDATE:19600620T000000
-TZNAME:GMT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Bamako
+X-LIC-LOCATION:Africa/Bamako
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
+TZOFFSETFROM:-0032
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19600620T000000
+RDATE:19600620T000000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bangui.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bangui.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bangui.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Bangui
+X-LIC-LOCATION:Africa/Bangui
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
+TZOFFSETFROM:+011420
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Banjul.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Banjul.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Banjul.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19350101T000000
-RDATE:19350101T000000
-TZNAME:WAT
-TZOFFSETFROM:-010636
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19640101T000000
-RDATE:19640101T000000
-TZNAME:GMT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Banjul
+X-LIC-LOCATION:Africa/Banjul
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:BMT
+TZOFFSETFROM:-010636
+TZOFFSETTO:-010636
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19350101T000000
+RDATE:19350101T000000
+TZNAME:WAT
+TZOFFSETFROM:-010636
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bissau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bissau.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bissau.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19750101T000000
-RDATE:19750101T000000
-TZNAME:GMT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Bissau
+X-LIC-LOCATION:Africa/Bissau
+BEGIN:STANDARD
+DTSTART:19110526T000000
+RDATE:19110526T000000
+TZNAME:WAT
+TZOFFSETFROM:-010220
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19750101T000000
+RDATE:19750101T000000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Blantyre.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Blantyre.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Blantyre.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Blantyre
+X-LIC-LOCATION:Africa/Blantyre
+BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:CAT
+TZOFFSETFROM:+0220
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Brazzaville.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Brazzaville.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Brazzaville.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Brazzaville
+X-LIC-LOCATION:Africa/Brazzaville
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
+TZOFFSETFROM:+010108
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bujumbura.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bujumbura.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Bujumbura.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Bujumbura
+X-LIC-LOCATION:Africa/Bujumbura
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CAT
+TZOFFSETFROM:+015728
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Cairo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Cairo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Cairo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,123 +1,117 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19571001T000000
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19590930T030000
-RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19661001T030000
-RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19840501T010000
-RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z;BYMONTH=5
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19900501T010000
-RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z;BYMONTH=5
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19950428T000000
-RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19950929T000000
-RRULE:FREQ=YEARLY;UNTIL=20050929T210000Z;BYDAY=FR;BYYEARDAY=-92,-93,-94,-9
- 5,-96,-97,-98
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20101001T000000
-RRULE:FREQ=YEARLY;BYDAY=FR;BYYEARDAY=-92,-93,-94,-95,-96,-97,-98
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19401001T000000
+RDATE:19401001T000000
+RDATE:19410916T000000
+RDATE:19421027T000000
+RDATE:20060922T000000
+RDATE:20070907T000000
+RDATE:20080829T000000
+RDATE:20090821T000000
+RDATE:20100811T000000
+RDATE:20101001T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19571001T000000
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19590930T030000
+RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19661001T030000
+RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840501T010000
+RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19900501T010000
+RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19950428T000000
+RRULE:FREQ=YEARLY;UNTIL=20100429T220000Z;BYDAY=-1FR;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19950929T000000
+RRULE:FREQ=YEARLY;UNTIL=20050929T210000Z;BYDAY=FR;BYYEARDAY=-92,-93,-94,-9
+ 5,-96,-97,-98
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Casablanca.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Casablanca.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Casablanca.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,69 +1,71 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Africa/Casablanca
-X-LIC-LOCATION:Africa/Casablanca
-BEGIN:STANDARD
-DTSTART:19131026T000000
-RDATE:19131026T000000
-TZNAME:WEST
-TZOFFSETFROM:-003020
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19390912T000000
-RDATE:19390912T000000
-RDATE:19400225T000000
-RDATE:19500611T000000
-RDATE:19670603T120000
-RDATE:19740624T000000
-RDATE:19780601T000000
-RDATE:20080601T000000
-RDATE:20090601T000000
-RDATE:20100502T000000
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19391119T000000
-RDATE:19391119T000000
-RDATE:19451118T000000
-RDATE:19501029T000000
-RDATE:19671001T000000
-RDATE:19740901T000000
-RDATE:19760801T000000
-RDATE:19770928T000000
-RDATE:19780804T000000
-RDATE:20080901T000000
-RDATE:20090821T000000
-RDATE:20100808T000000
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19760501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z;BYMONTH=5
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Casablanca
+X-LIC-LOCATION:Africa/Casablanca
+BEGIN:STANDARD
+DTSTART:19131026T000000
+RDATE:19131026T000000
+TZNAME:WEST
+TZOFFSETFROM:-003020
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19390912T000000
+RDATE:19390912T000000
+RDATE:19400225T000000
+RDATE:19500611T000000
+RDATE:19670603T120000
+RDATE:19740624T000000
+RDATE:19780601T000000
+RDATE:20080601T000000
+RDATE:20090601T000000
+RDATE:20100502T000000
+RDATE:20110403T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19391119T000000
+RDATE:19391119T000000
+RDATE:19451118T000000
+RDATE:19501029T000000
+RDATE:19671001T000000
+RDATE:19740901T000000
+RDATE:19760801T000000
+RDATE:19770928T000000
+RDATE:19780804T000000
+RDATE:20080901T000000
+RDATE:20090821T000000
+RDATE:20100808T000000
+RDATE:20110731T000000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z;BYMONTH=5
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ceuta.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,107 +1,107 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Africa/Ceuta
-X-LIC-LOCATION:Africa/Ceuta
-BEGIN:STANDARD
-DTSTART:19010101T000000
-RDATE:19010101T000000
-TZNAME:WET
-TZOFFSETFROM:-002116
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180506T230000
-RDATE:19180506T230000
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-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
-DTSTART:19240101T000000
-RDATE:19240101T000000
-RDATE:19290101T000000
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19240416T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19760501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z;BYMONTH=5
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840316T000000
-RDATE:19840316T000000
-TZNAME:CET
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Ceuta
+X-LIC-LOCATION:Africa/Ceuta
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:WET
+TZOFFSETFROM:-002116
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180506T230000
+RDATE:19180506T230000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+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
+DTSTART:19240101T000000
+RDATE:19240101T000000
+RDATE:19290101T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19240416T230000
+RDATE:19240416T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+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;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770501T000000Z;BYMONTH=5
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840316T000000
+RDATE:19840316T000000
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Conakry.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19340226T000000
-RDATE:19340226T000000
-TZNAME:WAT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19600101T000000
-RDATE:19600101T000000
-TZNAME:GMT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Conakry
+X-LIC-LOCATION:Africa/Conakry
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
+TZOFFSETFROM:-005452
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19600101T000000
+RDATE:19600101T000000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dakar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dakar.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dakar.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410601T000000
-RDATE:19410601T000000
-TZNAME:GMT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Dakar
+X-LIC-LOCATION:Africa/Dakar
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
+TZOFFSETFROM:-010944
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410601T000000
+RDATE:19410601T000000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Dar_es_Salaam.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19480101T000000
-RDATE:19480101T000000
-TZNAME:BEAUT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+024445
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19610101T000000
-RDATE:19610101T000000
-TZNAME:EAT
-TZOFFSETFROM:+024445
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19480101T000000
+RDATE:19480101T000000
+TZNAME:BEAUT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0245
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19610101T000000
+RDATE:19610101T000000
+TZNAME:EAT
+TZOFFSETFROM:+0245
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Djibouti.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Djibouti.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Djibouti.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Djibouti
+X-LIC-LOCATION:Africa/Djibouti
+BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:EAT
+TZOFFSETFROM:+025236
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Douala.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Douala.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Douala.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Douala
+X-LIC-LOCATION:Africa/Douala
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
+TZOFFSETFROM:+003848
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/El_Aaiun.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/El_Aaiun.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/El_Aaiun.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19760414T000000
-RDATE:19760414T000000
-TZNAME:WET
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/El_Aaiun
+X-LIC-LOCATION:Africa/El_Aaiun
+BEGIN:STANDARD
+DTSTART:19340101T000000
+RDATE:19340101T000000
+TZNAME:WAT
+TZOFFSETFROM:-005248
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19760414T000000
+RDATE:19760414T000000
+TZNAME:WET
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Freetown.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Freetown.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Freetown.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19351001T000000
-RRULE:FREQ=YEARLY;UNTIL=19421001T002000Z;BYMONTH=10
-TZNAME:WAT
-TZOFFSETFROM:-0020
-TZOFFSETTO:-0100
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19570901T000000
-RRULE:FREQ=YEARLY;UNTIL=19620831T230000Z;BYMONTH=9
-TZNAME:GMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19351001T000000
+RRULE:FREQ=YEARLY;UNTIL=19421001T002000Z;BYMONTH=10
+TZNAME:WAT
+TZOFFSETFROM:-0020
+TZOFFSETTO:-0100
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19570901T000000
+RRULE:FREQ=YEARLY;UNTIL=19620831T230000Z;BYMONTH=9
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Gaborone.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Gaborone.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Gaborone.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19430919T020000
-RDATE:19430919T020000
-TZNAME:CAST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19440319T020000
-RDATE:19440319T020000
-TZNAME:CAT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Gaborone
+X-LIC-LOCATION:Africa/Gaborone
+BEGIN:STANDARD
+DTSTART:18850101T000000
+RDATE:18850101T000000
+TZNAME:CAT
+TZOFFSETFROM:+014340
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19430919T020000
+RDATE:19430919T020000
+TZNAME:CAST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19440319T020000
+RDATE:19440319T020000
+TZNAME:CAT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Harare.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Harare.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Harare.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Harare
+X-LIC-LOCATION:Africa/Harare
+BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:CAT
+TZOFFSETFROM:+020412
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Johannesburg.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Johannesburg.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Johannesburg.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Africa/Johannesburg
-X-LIC-LOCATION:Africa/Johannesburg
-BEGIN:STANDARD
-DTSTART:18920208T000000
-RDATE:18920208T000000
-TZNAME:SAST
-TZOFFSETFROM:+0152
-TZOFFSETTO:+0130
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Johannesburg
+X-LIC-LOCATION:Africa/Johannesburg
+BEGIN:STANDARD
+DTSTART:18920208T000000
+RDATE:18920208T000000
+TZNAME:SAST
+TZOFFSETFROM:+0152
+TZOFFSETTO:+0130
+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
+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

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Juba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Juba.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Juba.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -0,0 +1,45 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Juba
+X-LIC-LOCATION:Africa/Juba
+BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:CAST
+TZOFFSETFROM:+020624
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19700501T000000
+RDATE:19700501T000000
+RDATE:19710430T000000
+TZNAME:CAST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19701015T000000
+RRULE:FREQ=YEARLY;UNTIL=19851014T210000Z;BYMONTH=10
+TZNAME:CAT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19720430T000000
+RRULE:FREQ=YEARLY;UNTIL=19850427T220000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CAST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20000115T120000
+RDATE:20000115T120000
+TZNAME:EAT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kampala.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kampala.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kampala.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300101T000000
-RDATE:19300101T000000
-TZNAME:BEAT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0230
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19480101T000000
-RDATE:19480101T000000
-TZNAME:BEAUT
-TZOFFSETFROM:+0230
-TZOFFSETTO:+024445
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19570101T000000
-RDATE:19570101T000000
-TZNAME:EAT
-TZOFFSETFROM:+024445
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Kampala
+X-LIC-LOCATION:Africa/Kampala
+BEGIN:STANDARD
+DTSTART:19280701T000000
+RDATE:19280701T000000
+TZNAME:EAT
+TZOFFSETFROM:+020940
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300101T000000
+RDATE:19300101T000000
+TZNAME:BEAT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0230
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19480101T000000
+RDATE:19480101T000000
+TZNAME:BEAUT
+TZOFFSETFROM:+0230
+TZOFFSETTO:+0245
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570101T000000
+RDATE:19570101T000000
+TZNAME:EAT
+TZOFFSETFROM:+0245
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Khartoum.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Khartoum.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Khartoum.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,45 +1,45 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Africa/Khartoum
-X-LIC-LOCATION:Africa/Khartoum
-BEGIN:STANDARD
-DTSTART:19310101T000000
-RDATE:19310101T000000
-TZNAME:CAST
-TZOFFSETFROM:+021008
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19700501T000000
-RDATE:19700501T000000
-RDATE:19710430T000000
-TZNAME:CAST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19701015T000000
-RRULE:FREQ=YEARLY;UNTIL=19851014T210000Z;BYMONTH=10
-TZNAME:CAT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19720430T000000
-RRULE:FREQ=YEARLY;UNTIL=19850427T220000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CAST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20000115T120000
-RDATE:20000115T120000
-TZNAME:EAT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Khartoum
+X-LIC-LOCATION:Africa/Khartoum
+BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:CAST
+TZOFFSETFROM:+021008
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19700501T000000
+RDATE:19700501T000000
+RDATE:19710430T000000
+TZNAME:CAST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19701015T000000
+RRULE:FREQ=YEARLY;UNTIL=19851014T210000Z;BYMONTH=10
+TZNAME:CAT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19720430T000000
+RRULE:FREQ=YEARLY;UNTIL=19850427T220000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CAST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20000115T120000
+RDATE:20000115T120000
+TZNAME:EAT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kigali.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kigali.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kigali.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Kigali
+X-LIC-LOCATION:Africa/Kigali
+BEGIN:STANDARD
+DTSTART:19350601T000000
+RDATE:19350601T000000
+TZNAME:CAT
+TZOFFSETFROM:+020016
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kinshasa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kinshasa.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Kinshasa.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Kinshasa
+X-LIC-LOCATION:Africa/Kinshasa
+BEGIN:STANDARD
+DTSTART:18971109T000000
+RDATE:18971109T000000
+TZNAME:WAT
+TZOFFSETFROM:+010112
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lagos.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lagos.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lagos.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Lagos
+X-LIC-LOCATION:Africa/Lagos
+BEGIN:STANDARD
+DTSTART:19190901T000000
+RDATE:19190901T000000
+TZNAME:WAT
+TZOFFSETFROM:+001336
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Libreville.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Libreville.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Libreville.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Libreville
+X-LIC-LOCATION:Africa/Libreville
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
+TZOFFSETFROM:+003748
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lome.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lome.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lome.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Lome
+X-LIC-LOCATION:Africa/Lome
+BEGIN:STANDARD
+DTSTART:18930101T000000
+RDATE:18930101T000000
+TZNAME:GMT
+TZOFFSETFROM:+000452
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Luanda.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Luanda.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Luanda.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110526T000000
-RDATE:19110526T000000
-TZNAME:WAT
-TZOFFSETFROM:+005204
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Luanda
+X-LIC-LOCATION:Africa/Luanda
+BEGIN:STANDARD
+DTSTART:18920101T000000
+RDATE:18920101T000000
+TZNAME:AOT
+TZOFFSETFROM:+005256
+TZOFFSETTO:+005204
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110526T000000
+RDATE:19110526T000000
+TZNAME:WAT
+TZOFFSETFROM:+005204
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lubumbashi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lubumbashi.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lubumbashi.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Lubumbashi
+X-LIC-LOCATION:Africa/Lubumbashi
+BEGIN:STANDARD
+DTSTART:18971109T000000
+RDATE:18971109T000000
+TZNAME:CAT
+TZOFFSETFROM:+014952
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lusaka.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lusaka.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Lusaka.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Lusaka
+X-LIC-LOCATION:Africa/Lusaka
+BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:CAT
+TZOFFSETFROM:+015308
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Malabo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Malabo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Malabo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19631215T000000
-RDATE:19631215T000000
-TZNAME:WAT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Malabo
+X-LIC-LOCATION:Africa/Malabo
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
+TZOFFSETFROM:+003508
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19631215T000000
+RDATE:19631215T000000
+TZNAME:WAT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maputo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maputo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maputo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Maputo
+X-LIC-LOCATION:Africa/Maputo
+BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:CAT
+TZOFFSETFROM:+021020
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maseru.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maseru.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Maseru.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19440319T020000
-RDATE:19440319T020000
-TZNAME:SAST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19440319T020000
+RDATE:19440319T020000
+TZNAME:SAST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mbabane.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mbabane.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mbabane.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Mbabane
+X-LIC-LOCATION:Africa/Mbabane
+BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:SAST
+TZOFFSETFROM:+020424
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mogadishu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mogadishu.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Mogadishu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19310101T000000
-RDATE:19310101T000000
-TZNAME:BEAT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0230
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19570101T000000
-RDATE:19570101T000000
-TZNAME:EAT
-TZOFFSETFROM:+0230
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Mogadishu
+X-LIC-LOCATION:Africa/Mogadishu
+BEGIN:STANDARD
+DTSTART:18931101T000000
+RDATE:18931101T000000
+TZNAME:EAT
+TZOFFSETFROM:+030128
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:BEAT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0230
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570101T000000
+RDATE:19570101T000000
+TZNAME:EAT
+TZOFFSETFROM:+0230
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Monrovia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Monrovia.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Monrovia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19190301T000000
-RDATE:19190301T000000
-TZNAME:LRT
-TZOFFSETFROM:-004308
-TZOFFSETTO:-004430
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19720501T000000
-RDATE:19720501T000000
-TZNAME:GMT
-TZOFFSETFROM:-004430
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Monrovia
+X-LIC-LOCATION:Africa/Monrovia
+BEGIN:STANDARD
+DTSTART:18820101T000000
+RDATE:18820101T000000
+TZNAME:MMT
+TZOFFSETFROM:-004308
+TZOFFSETTO:-004308
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19190301T000000
+RDATE:19190301T000000
+TZNAME:LRT
+TZOFFSETFROM:-004308
+TZOFFSETTO:-004430
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19720501T000000
+RDATE:19720501T000000
+TZNAME:GMT
+TZOFFSETFROM:-004430
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nairobi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nairobi.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nairobi.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300101T000000
-RDATE:19300101T000000
-TZNAME:BEAT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0230
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19400101T000000
-RDATE:19400101T000000
-TZNAME:BEAUT
-TZOFFSETFROM:+0230
-TZOFFSETTO:+024445
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19600101T000000
-RDATE:19600101T000000
-TZNAME:EAT
-TZOFFSETFROM:+024445
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Nairobi
+X-LIC-LOCATION:Africa/Nairobi
+BEGIN:STANDARD
+DTSTART:19280701T000000
+RDATE:19280701T000000
+TZNAME:EAT
+TZOFFSETFROM:+022716
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300101T000000
+RDATE:19300101T000000
+TZNAME:BEAT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0230
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400101T000000
+RDATE:19400101T000000
+TZNAME:BEAUT
+TZOFFSETFROM:+0230
+TZOFFSETTO:+0245
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19600101T000000
+RDATE:19600101T000000
+TZNAME:EAT
+TZOFFSETFROM:+0245
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ndjamena.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ndjamena.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ndjamena.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19791014T000000
-RDATE:19791014T000000
-TZNAME:WAST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800308T000000
-RDATE:19800308T000000
-TZNAME:WAT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Ndjamena
+X-LIC-LOCATION:Africa/Ndjamena
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
+TZOFFSETFROM:+010012
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19791014T000000
+RDATE:19791014T000000
+TZNAME:WAST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800308T000000
+RDATE:19800308T000000
+TZNAME:WAT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Niamey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Niamey.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Niamey.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19340226T000000
-RDATE:19340226T000000
-TZNAME:GMT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19600101T000000
-RDATE:19600101T000000
-TZNAME:WAT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Niamey
+X-LIC-LOCATION:Africa/Niamey
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:WAT
+TZOFFSETFROM:+000828
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19600101T000000
+RDATE:19600101T000000
+TZNAME:WAT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nouakchott.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nouakchott.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Nouakchott.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19340226T000000
-RDATE:19340226T000000
-TZNAME:WAT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19601128T000000
-RDATE:19601128T000000
-TZNAME:GMT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Nouakchott
+X-LIC-LOCATION:Africa/Nouakchott
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
+TZOFFSETFROM:-010348
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19601128T000000
+RDATE:19601128T000000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ouagadougou.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ouagadougou.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Ouagadougou.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Ouagadougou
+X-LIC-LOCATION:Africa/Ouagadougou
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
+TZOFFSETFROM:-000604
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Porto-Novo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Porto-Novo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Porto-Novo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19340226T000000
-RDATE:19340226T000000
-TZNAME:WAT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Porto-Novo
+X-LIC-LOCATION:Africa/Porto-Novo
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
+TZOFFSETFROM:+001028
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Sao_Tome.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Sao_Tome.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Sao_Tome.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Africa/Sao_Tome
-X-LIC-LOCATION:Africa/Sao_Tome
-BEGIN:STANDARD
-DTSTART:19120101T000000
-RDATE:19120101T000000
-TZNAME:GMT
-TZOFFSETFROM:-003632
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Sao_Tome
+X-LIC-LOCATION:Africa/Sao_Tome
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Timbuktu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19340226T000000
-RDATE:19340226T000000
-TZNAME:WAT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19600620T000000
-RDATE:19600620T000000
-TZNAME:GMT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Timbuktu
+X-LIC-LOCATION:Africa/Timbuktu
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:GMT
+TZOFFSETFROM:-0032
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19340226T000000
+RDATE:19340226T000000
+TZNAME:WAT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19600620T000000
+RDATE:19600620T000000
+TZNAME:GMT
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tripoli.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tripoli.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tripoli.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,95 +1,95 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19520101T000000
-RDATE:19520101T000000
-RDATE:19540101T000000
-RDATE:19560101T000000
-RDATE:19861003T000000
-RDATE:19960930T000000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19590101T000000
-RDATE:19590101T000000
-RDATE:19900504T000000
-TZNAME:EET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820101T000000
-RDATE:19820101T000000
-TZNAME:CEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19820401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z;BYMONTH=4
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z;BYMONTH=10
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870401T000000
-RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z;BYMONTH=4
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19871001T000000
-RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z;BYMONTH=10
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19970404T000000
-RDATE:19970404T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19971004T000000
-RDATE:19971004T000000
-TZNAME:EET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19520101T000000
+RDATE:19520101T000000
+RDATE:19540101T000000
+RDATE:19560101T000000
+RDATE:19861003T000000
+RDATE:19960930T000000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19590101T000000
+RDATE:19590101T000000
+RDATE:19900504T000000
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19820401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870401T000000
+RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871001T000000
+RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19970404T000000
+RDATE:19970404T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19971004T000000
+RDATE:19971004T000000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tunis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tunis.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Tunis.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,84 +1,84 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Africa/Tunis
-X-LIC-LOCATION:Africa/Tunis
-BEGIN:STANDARD
-DTSTART:18810512T000000
-RDATE:18810512T000000
-TZNAME:PMT
-TZOFFSETFROM:+004044
-TZOFFSETTO:+000921
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110311T000000
-RDATE:19110311T000000
-TZNAME:CEST
-TZOFFSETFROM:+000921
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19390415T230000
-RDATE:19390415T230000
-RDATE:19400225T230000
-RDATE:19420309T000000
-RDATE:19430329T020000
-RDATE:19430425T020000
-RDATE:19770430T000000
-RDATE:19780501T000000
-RDATE:19880601T000000
-RDATE:19890326T000000
-RDATE:19900501T000000
-RDATE:20050501T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19391119T000000
-RDATE:19391119T000000
-RDATE:19411006T000000
-RDATE:19421102T030000
-RDATE:19430417T020000
-RDATE:19431004T020000
-RDATE:19441008T000000
-RDATE:19450916T000000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Tunis
+X-LIC-LOCATION:Africa/Tunis
+BEGIN:STANDARD
+DTSTART:18810512T000000
+RDATE:18810512T000000
+TZNAME:PMT
+TZOFFSETFROM:+004044
+TZOFFSETTO:+000921
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110311T000000
+RDATE:19110311T000000
+TZNAME:CEST
+TZOFFSETFROM:+000921
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19390415T230000
+RDATE:19390415T230000
+RDATE:19400225T230000
+RDATE:19420309T000000
+RDATE:19430329T020000
+RDATE:19430425T020000
+RDATE:19770430T000000
+RDATE:19780501T000000
+RDATE:19880601T000000
+RDATE:19890326T000000
+RDATE:19900501T000000
+RDATE:20050501T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19391119T000000
+RDATE:19391119T000000
+RDATE:19411006T000000
+RDATE:19421102T030000
+RDATE:19430417T020000
+RDATE:19431004T020000
+RDATE:19441008T000000
+RDATE:19450916T000000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Africa/Windhoek.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,65 +1,65 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Africa/Windhoek
-X-LIC-LOCATION:Africa/Windhoek
-BEGIN:STANDARD
-DTSTART:18920208T000000
-RDATE:18920208T000000
-TZNAME:SWAT
-TZOFFSETFROM:+010824
-TZOFFSETTO:+0130
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19030301T000000
-RDATE:19030301T000000
-TZNAME:SAST
-TZOFFSETFROM:+0130
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420920T020000
-RDATE:19420920T020000
-TZNAME:SAST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19430321T020000
-RDATE:19430321T020000
-TZNAME:SAST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900321T000000
-RDATE:19900321T000000
-TZNAME:CAT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Africa/Windhoek
+X-LIC-LOCATION:Africa/Windhoek
+BEGIN:STANDARD
+DTSTART:18920208T000000
+RDATE:18920208T000000
+TZNAME:SWAT
+TZOFFSETFROM:+010824
+TZOFFSETTO:+0130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19030301T000000
+RDATE:19030301T000000
+TZNAME:SAST
+TZOFFSETFROM:+0130
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420920T020000
+RDATE:19420920T020000
+TZNAME:SAST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19430321T020000
+RDATE:19430321T020000
+TZNAME:SAST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900321T000000
+RDATE:19900321T000000
+TZNAME:CAT
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Adak.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,131 +1,131 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Adak
-X-LIC-LOCATION:America/Adak
-BEGIN:STANDARD
-DTSTART:19000820T120000
-RDATE:19000820T120000
-TZNAME:NST
-TZOFFSETFROM:-114638
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-TZNAME:NST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:NWT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T130000
-RDATE:19450814T130000
-TZNAME:NPT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:NST
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Adak
+X-LIC-LOCATION:America/Adak
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:NST
+TZOFFSETFROM:-114638
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+TZNAME:NST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T130000
+RDATE:19450814T130000
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anchorage.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,137 +1,137 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Anchorage
-X-LIC-LOCATION:America/Anchorage
-BEGIN:STANDARD
-DTSTART:19000820T120000
-RDATE:19000820T120000
-TZNAME:CAT
-TZOFFSETFROM:-095936
-TZOFFSETTO:-1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420101T000000
-RDATE:19420101T000000
-TZNAME:CAT/CAWT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:CAT/CAWT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T140000
-RDATE:19450814T140000
-TZNAME:CAT/CAPT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:CAT/CAPT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-TZNAME:CAT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Anchorage
+X-LIC-LOCATION:America/Anchorage
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:CAT
+TZOFFSETFROM:-095936
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+TZNAME:CAT/CAWT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CAT/CAWT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T140000
+RDATE:19450814T140000
+TZNAME:CAT/CAPT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:CAT/CAPT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:CAT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Anguilla.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Anguilla
+X-LIC-LOCATION:America/Anguilla
+BEGIN:STANDARD
+DTSTART:19120302T000000
+RDATE:19120302T000000
+TZNAME:AST
+TZOFFSETFROM:-041216
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Antigua.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Antigua.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Antigua.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19510101T000000
-RDATE:19510101T000000
-TZNAME:AST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Antigua
+X-LIC-LOCATION:America/Antigua
+BEGIN:STANDARD
+DTSTART:19120302T000000
+RDATE:19120302T000000
+TZNAME:EST
+TZOFFSETFROM:-040712
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:AST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Araguaina.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Araguaina.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Araguaina.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Araguaina
-X-LIC-LOCATION:America/Araguaina
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:BRST
-TZOFFSETFROM:-031248
-TZOFFSETTO:-0300
-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: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
-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:19960211T000000
-RDATE:19970216T000000
-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:STANDARD
-DTSTART:19900917T000000
-RDATE:19900917T000000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Araguaina
+X-LIC-LOCATION:America/Araguaina
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-031248
+TZOFFSETTO:-0300
+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: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
+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:19960211T000000
+RDATE:19970216T000000
+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:STANDARD
+DTSTART:19900917T000000
+RDATE:19900917T000000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Buenos_Aires.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,143 +1,143 @@
-BEGIN:VCALENDAR
-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
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-035348
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
-TZNAME:ARST
-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
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/Buenos_Aires
+X-LIC-LOCATION:America/Argentina/Buenos_Aires
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-035348
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Catamarca.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,173 +1,173 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Argentina/Catamarca
-X-LIC-LOCATION:America/Argentina/Catamarca
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-042308
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:20040620T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19921018T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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:-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: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
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/Catamarca
+X-LIC-LOCATION:America/Argentina/Catamarca
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042308
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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:-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: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
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/ComodRivadavia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/ComodRivadavia.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/ComodRivadavia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,173 +1,173 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Argentina/ComodRivadavia
-X-LIC-LOCATION:America/Argentina/ComodRivadavia
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-042308
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:20040620T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19921018T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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:-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: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
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/ComodRivadavia
+X-LIC-LOCATION:America/Argentina/ComodRivadavia
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042308
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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:-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: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
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Cordoba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Cordoba.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Cordoba.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,165 +1,165 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Argentina/Cordoba
-X-LIC-LOCATION:America/Argentina/Cordoba
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-041648
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19921018T000000
-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=19900304T020000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0200
-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: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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/Cordoba
+X-LIC-LOCATION:America/Argentina/Cordoba
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-041648
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+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=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+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: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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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/Jujuy.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Jujuy.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Jujuy.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,174 +1,174 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Argentina/Jujuy
-X-LIC-LOCATION:America/Argentina/Jujuy
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-042112
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19891015T000000
-RDATE:19921018T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T000000
-RDATE:19901028T000000
-TZNAME:WARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910317T000000
-RDATE:19910317T000000
-TZNAME:WART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19911006T000000
-RDATE:19911006T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920101T000000
-RDATE:19920101T000000
-TZNAME:ARST
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20081018T000000
-RDATE:20081018T000000
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/Jujuy
+X-LIC-LOCATION:America/Argentina/Jujuy
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042112
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19891015T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T000000
+RDATE:19901028T000000
+TZNAME:WARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910317T000000
+RDATE:19910317T000000
+TZNAME:WART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19911006T000000
+RDATE:19911006T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
+TZNAME:ARST
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20081018T000000
+RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/La_Rioja.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,173 +1,173 @@
-BEGIN:VCALENDAR
-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
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-042724
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:19910507T000000
-RDATE:20040620T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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:-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19991003T000000
-RDATE:19991003T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/La_Rioja
+X-LIC-LOCATION:America/Argentina/La_Rioja
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042724
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:19910507T000000
+RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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:-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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Mendoza.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Mendoza.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Mendoza.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,164 +1,164 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Argentina/Mendoza
-X-LIC-LOCATION:America/Argentina/Mendoza
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-043516
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:20040926T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19891015T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19740501T000000
-RDATE:19740501T000000
-RDATE:19890305T000000
-RDATE:19930307T000000
-RDATE:20080316T000000
-TZNAME:ART
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900304T000000
-RDATE:19900304T000000
-TZNAME:WART
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901015T000000
-RDATE:19901015T000000
-RDATE:19911015T000000
-TZNAME:WARST
-TZOFFSETFROM:-0400
-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
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19991003T000000
-RDATE:19991003T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20000303T000000
-RDATE:20000303T000000
-RDATE:20081018T000000
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/Mendoza
+X-LIC-LOCATION:America/Argentina/Mendoza
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043516
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040926T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19891015T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19740501T000000
+RDATE:19740501T000000
+RDATE:19890305T000000
+RDATE:19930307T000000
+RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900304T000000
+RDATE:19900304T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901015T000000
+RDATE:19901015T000000
+RDATE:19911015T000000
+TZNAME:WARST
+TZOFFSETFROM:-0400
+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
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000303T000000
+RDATE:20000303T000000
+RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Rio_Gallegos.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,151 +1,151 @@
-BEGIN:VCALENDAR
-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
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-043652
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:20040620T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19991003T000000
-RDATE:19991003T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/Rio_Gallegos
+X-LIC-LOCATION:America/Argentina/Rio_Gallegos
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043652
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Salta.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Salta.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Salta.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,165 +1,165 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Argentina/Salta
-X-LIC-LOCATION:America/Argentina/Salta
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-042140
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19921018T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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:-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: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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20081018T000000
-RDATE:20081018T000000
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/Salta
+X-LIC-LOCATION:America/Argentina/Salta
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042140
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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:-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: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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20081018T000000
+RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Juan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,173 +1,173 @@
-BEGIN:VCALENDAR
-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
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-043404
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:19910507T000000
-RDATE:20040725T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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:-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19991003T000000
-RDATE:19991003T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/San_Juan
+X-LIC-LOCATION:America/Argentina/San_Juan
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043404
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:19910507T000000
+RDATE:20040725T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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:-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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/San_Luis.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,187 +1,187 @@
-BEGIN:VCALENDAR
-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
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-042524
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:20040725T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19891015T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19740501T000000
-RDATE:19740501T000000
-RDATE:19890305T000000
-TZNAME:ART
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900101T000000
-RDATE:19900101T000000
-TZNAME:ARST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900314T000000
-RDATE:19900314T000000
-TZNAME:WART
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901015T000000
-RDATE:19901015T000000
-TZNAME:WARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910301T000000
-RDATE:19910301T000000
-RDATE:20040531T000000
-TZNAME:WART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910601T000000
-RDATE:19910601T000000
-TZNAME:ART
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19991003T000000
-RDATE:19991003T000000
-TZNAME:WARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/San_Luis
+X-LIC-LOCATION:America/Argentina/San_Luis
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042524
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040725T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19891015T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19740501T000000
+RDATE:19740501T000000
+RDATE:19890305T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900101T000000
+RDATE:19900101T000000
+TZNAME:ARST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900314T000000
+RDATE:19900314T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901015T000000
+RDATE:19901015T000000
+TZNAME:WARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910301T000000
+RDATE:19910301T000000
+RDATE:20040531T000000
+TZNAME:WART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910601T000000
+RDATE:19910601T000000
+TZNAME:ART
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+TZNAME:WARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Tucuman.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Tucuman.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Tucuman.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,179 +1,179 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Argentina/Tucuman
-X-LIC-LOCATION:America/Argentina/Tucuman
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-042052
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:20040613T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19921018T000000
-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=19900304T020000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0200
-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: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
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20000303T000000
-RDATE:20000303T000000
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/Tucuman
+X-LIC-LOCATION:America/Argentina/Tucuman
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042052
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040613T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+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=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+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: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
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000303T000000
+RDATE:20000303T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Argentina/Ushuaia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,151 +1,151 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Argentina/Ushuaia
-X-LIC-LOCATION:America/Argentina/Ushuaia
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-043312
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:20040620T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19991003T000000
-RDATE:19991003T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Argentina/Ushuaia
+X-LIC-LOCATION:America/Argentina/Ushuaia
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043312
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Aruba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Aruba.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Aruba.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19650101T000000
-RDATE:19650101T000000
-TZNAME:AST
-TZOFFSETFROM:-0430
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Aruba
+X-LIC-LOCATION:America/Aruba
+BEGIN:STANDARD
+DTSTART:19120212T000000
+RDATE:19120212T000000
+TZNAME:ANT
+TZOFFSETFROM:-044024
+TZOFFSETTO:-0430
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19650101T000000
+RDATE:19650101T000000
+TZNAME:AST
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Asuncion.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Asuncion.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Asuncion.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,155 +1,155 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Asuncion
-X-LIC-LOCATION:America/Asuncion
-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;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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19931001T000000
-RRULE:FREQ=YEARLY;UNTIL=19951001T040000Z;BYMONTH=10
-TZNAME:PYST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19940227T000000
-RRULE:FREQ=YEARLY;UNTIL=19950226T030000Z;BYDAY=-1SU;BYMONTH=2
-TZNAME:PYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19961006T000000
-RRULE:FREQ=YEARLY;UNTIL=20011007T040000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:PYST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19980301T000000
-RRULE:FREQ=YEARLY;UNTIL=20010304T030000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:PYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20020407T000000
-RRULE:FREQ=YEARLY;UNTIL=20040404T030000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:PYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20020901T000000
-RRULE:FREQ=YEARLY;UNTIL=20030907T040000Z;BYDAY=1SU;BYMONTH=9
-TZNAME:PYST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20041017T000000
-RRULE:FREQ=YEARLY;UNTIL=20091018T040000Z;BYDAY=3SU;BYMONTH=10
-TZNAME:PYST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20050313T000000
-RRULE:FREQ=YEARLY;UNTIL=20090308T030000Z;BYDAY=2SU;BYMONTH=3
-TZNAME:PYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20100411T000000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=4
-TZNAME:PYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20101003T000000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:PYST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Asuncion
+X-LIC-LOCATION:America/Asuncion
+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;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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19931001T000000
+RRULE:FREQ=YEARLY;UNTIL=19951001T040000Z;BYMONTH=10
+TZNAME:PYST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19940227T000000
+RRULE:FREQ=YEARLY;UNTIL=19950226T030000Z;BYDAY=-1SU;BYMONTH=2
+TZNAME:PYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19961006T000000
+RRULE:FREQ=YEARLY;UNTIL=20011007T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:PYST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19980301T000000
+RRULE:FREQ=YEARLY;UNTIL=20010304T030000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:PYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20020407T000000
+RRULE:FREQ=YEARLY;UNTIL=20040404T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020901T000000
+RRULE:FREQ=YEARLY;UNTIL=20030907T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:PYST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20041017T000000
+RRULE:FREQ=YEARLY;UNTIL=20091018T040000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:PYST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20050313T000000
+RRULE:FREQ=YEARLY;UNTIL=20090308T030000Z;BYDAY=2SU;BYMONTH=3
+TZNAME:PYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100411T000000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=4
+TZNAME:PYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20101003T000000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:PYST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atikokan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atikokan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atikokan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-TZNAME:CPT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:EST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Atikokan
+X-LIC-LOCATION:America/Atikokan
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CST
+TZOFFSETFROM:-060628
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atka.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atka.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Atka.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,131 +1,131 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Atka
-X-LIC-LOCATION:America/Atka
-BEGIN:STANDARD
-DTSTART:19000820T120000
-RDATE:19000820T120000
-TZNAME:NST
-TZOFFSETFROM:-114638
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-TZNAME:NST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:NWT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T130000
-RDATE:19450814T130000
-TZNAME:NPT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:NST
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Atka
+X-LIC-LOCATION:America/Atka
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:NST
+TZOFFSETFROM:-114638
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+TZNAME:NST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T130000
+RDATE:19450814T130000
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,133 +1,133 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Bahia
-X-LIC-LOCATION:America/Bahia
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:BRST
-TZOFFSETFROM:-023404
-TZOFFSETTO:-0300
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Bahia
+X-LIC-LOCATION:America/Bahia
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-023404
+TZOFFSETTO:-0300
+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
+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
+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
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia_Banderas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia_Banderas.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bahia_Banderas.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,105 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Barbados.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,52 +1,52 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Barbados
-X-LIC-LOCATION:America/Barbados
-BEGIN:STANDARD
-DTSTART:19240101T000000
-RDATE:19240101T000000
-TZNAME:BMT
-TZOFFSETFROM:-035828
-TZOFFSETTO:-035828
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19320101T000000
-RDATE:19320101T000000
-TZNAME:AST
-TZOFFSETFROM:-035828
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19770612T020000
-RDATE:19770612T020000
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19771002T020000
-RRULE:FREQ=YEARLY;UNTIL=19781001T050000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19780416T020000
-RRULE:FREQ=YEARLY;UNTIL=19800420T060000Z;BYDAY=3SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T020000
-RDATE:19790930T020000
-RDATE:19800925T020000
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Barbados
+X-LIC-LOCATION:America/Barbados
+BEGIN:STANDARD
+DTSTART:19240101T000000
+RDATE:19240101T000000
+TZNAME:BMT
+TZOFFSETFROM:-035828
+TZOFFSETTO:-035828
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320101T000000
+RDATE:19320101T000000
+TZNAME:AST
+TZOFFSETFROM:-035828
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770612T020000
+RDATE:19770612T020000
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19771002T020000
+RRULE:FREQ=YEARLY;UNTIL=19781001T050000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19780416T020000
+RRULE:FREQ=YEARLY;UNTIL=19800420T060000Z;BYDAY=3SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belem.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,85 +1,85 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Belem
-X-LIC-LOCATION:America/Belem
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:BRST
-TZOFFSETFROM:-031356
-TZOFFSETTO:-0300
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-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
-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:STANDARD
-DTSTART:19880912T000000
-RDATE:19880912T000000
-TZNAME:BRT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Belem
+X-LIC-LOCATION:America/Belem
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-031356
+TZOFFSETTO:-0300
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+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
+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: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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Belize.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,48 +1,48 @@
-BEGIN:VCALENDAR
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19731205T000000
-RDATE:19731205T000000
-RDATE:19821218T000000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19740209T000000
-RDATE:19740209T000000
-RDATE:19830212T000000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19731205T000000
+RDATE:19731205T000000
+RDATE:19821218T000000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Blanc-Sablon.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,52 +1,52 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T200000
-RDATE:19450814T200000
-TZNAME:APT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19700101T000000
-RDATE:19700101T000000
-TZNAME:AST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Blanc-Sablon
+X-LIC-LOCATION:America/Blanc-Sablon
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:AST
+TZOFFSETFROM:-034828
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19700101T000000
+RDATE:19700101T000000
+TZNAME:AST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boa_Vista.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boa_Vista.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boa_Vista.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,96 +1,96 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Boa_Vista
-X-LIC-LOCATION:America/Boa_Vista
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:AMST
-TZOFFSETFROM:-040240
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19311003T110000
-RDATE:19311003T110000
-RDATE:19321003T000000
-RDATE:19631209T000000
-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
-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
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:20000227T000000
-RDATE:20001015T000000
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Boa_Vista
+X-LIC-LOCATION:America/Boa_Vista
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-040240
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19311003T110000
+RDATE:19311003T110000
+RDATE:19321003T000000
+RDATE:19631209T000000
+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
+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
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:20000227T000000
+RDATE:20001015T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Bogota.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19141123T000000
-RDATE:19141123T000000
-TZNAME:COST
-TZOFFSETFROM:-045620
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920503T000000
-RDATE:19920503T000000
-TZNAME:COST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19930404T000000
-RDATE:19930404T000000
-TZNAME:COT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Bogota
+X-LIC-LOCATION:America/Bogota
+BEGIN:STANDARD
+DTSTART:18840313T000000
+RDATE:18840313T000000
+TZNAME:BMT
+TZOFFSETFROM:-045620
+TZOFFSETTO:-045620
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19141123T000000
+RDATE:19141123T000000
+TZNAME:COST
+TZOFFSETFROM:-045620
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920503T000000
+RDATE:19920503T000000
+TZNAME:COST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930404T000000
+RDATE:19930404T000000
+TZNAME:COT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boise.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boise.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Boise.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,128 +1,128 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;UNTIL=19191026T090000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19230513T020000
-RDATE:19230513T020000
-TZNAME:MST
-TZOFFSETFROM:-0800
-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=19731028T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19740101T000000
-RDATE:19740101T000000
-TZNAME:MST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19740203T020000
-RDATE:19740203T020000
-TZNAME:MST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19750223T020000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19230513T020000
+RDATE:19230513T020000
+TZNAME:MST
+TZOFFSETFROM:-0800
+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=19731028T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740101T000000
+RDATE:19740101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740203T020000
+RDATE:19740203T020000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19750223T020000
+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/America/Buenos_Aires.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Buenos_Aires.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Buenos_Aires.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,143 +1,143 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Buenos_Aires
-X-LIC-LOCATION:America/Buenos_Aires
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-035348
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19891015T000000
-RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
-TZNAME:ARST
-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
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Buenos_Aires
+X-LIC-LOCATION:America/Buenos_Aires
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-035348
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19891015T000000
+RRULE:FREQ=YEARLY;UNTIL=19921018T030000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:ARST
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cambridge_Bay.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,135 +1,135 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Cambridge_Bay
-X-LIC-LOCATION:America/Cambridge_Bay
-BEGIN:STANDARD
-DTSTART:19200101T000000
-RDATE:19200101T000000
-TZNAME:MST
-TZOFFSETFROM:+0000
-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:19650425T000000
-RDATE:19650425T000000
-TZNAME:MDDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RDATE:19651031T020000
-TZNAME:MST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;UNTIL=19981025T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;UNTIL=19990404T090000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19991031T020000
-RDATE:19991031T020000
-TZNAME:CST
-TZOFFSETFROM:-0600
-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
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20001105T000000
-RDATE:20001105T000000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Cambridge_Bay
+X-LIC-LOCATION:America/Cambridge_Bay
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:MST
+TZOFFSETFROM:+0000
+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:19650425T000000
+RDATE:19650425T000000
+TZNAME:MDDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:MST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19981025T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19990404T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19991031T020000
+RDATE:19991031T020000
+TZNAME:CST
+TZOFFSETFROM:-0600
+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
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20001105T000000
+RDATE:20001105T000000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Campo_Grande.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,162 +1,162 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Campo_Grande
-X-LIC-LOCATION:America/Campo_Grande
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:AMST
-TZOFFSETFROM:-033828
-TZOFFSETTO:-0400
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-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:DAYLIGHT
-DTSTART:19931017T000000
-RRULE:FREQ=YEARLY;UNTIL=19951015T040000Z;BYDAY=-3SU;BYMONTH=10
-TZNAME:AMST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19940220T000000
-RRULE:FREQ=YEARLY;UNTIL=19950219T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;UNTIL=20011014T040000Z;BYDAY=2SU;BYMONTH=10
-TZNAME:AMST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010218T000000
-RRULE:FREQ=YEARLY;UNTIL=20060219T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20080217T000000
-RRULE:FREQ=YEARLY;UNTIL=20110220T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
-TZNAME:AMST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20130217T000000
-RRULE:FREQ=YEARLY;UNTIL=20140216T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20160221T000000
-RRULE:FREQ=YEARLY;UNTIL=20170219T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Campo_Grande
+X-LIC-LOCATION:America/Campo_Grande
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-033828
+TZOFFSETTO:-0400
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+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:DAYLIGHT
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;UNTIL=19951015T040000Z;BYDAY=-3SU;BYMONTH=10
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;UNTIL=19950219T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;UNTIL=20011014T040000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;UNTIL=20060219T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;UNTIL=20110220T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;UNTIL=20140216T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;UNTIL=20170219T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cancun.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,86 +1,86 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;UNTIL=19971026T060000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990404T020000
-RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20010506T020000
-RDATE:20010506T020000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010930T020000
-RDATE:20010930T020000
-TZNAME:CST
-TZOFFSETFROM:-0500
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=19971026T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19990404T020000
+RRULE:FREQ=YEARLY;UNTIL=20000402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20010506T020000
+RDATE:20010506T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010930T020000
+RDATE:20010930T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+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/Caracas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Caracas.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Caracas.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120212T000000
-RDATE:19120212T000000
-TZNAME:VET
-TZOFFSETFROM:-042740
-TZOFFSETTO:-0430
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19650101T000000
-RDATE:19650101T000000
-TZNAME:VET
-TZOFFSETFROM:-0430
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20071209T030000
-RDATE:20071209T030000
-TZNAME:VET
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0430
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Caracas
+X-LIC-LOCATION:America/Caracas
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
+TZOFFSETFROM:-042744
+TZOFFSETTO:-042740
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120212T000000
+RDATE:19120212T000000
+TZNAME:VET
+TZOFFSETFROM:-042740
+TZOFFSETTO:-0430
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19650101T000000
+RDATE:19650101T000000
+TZNAME:VET
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20071209T030000
+RDATE:20071209T030000
+TZNAME:VET
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0430
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Catamarca.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Catamarca.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Catamarca.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,173 +1,173 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Catamarca
-X-LIC-LOCATION:America/Catamarca
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-042308
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:20040620T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19921018T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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:-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: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
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Catamarca
+X-LIC-LOCATION:America/Catamarca
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042308
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040620T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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:-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: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
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayenne.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayenne.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayenne.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19671001T000000
-RDATE:19671001T000000
-TZNAME:GFT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Cayenne
+X-LIC-LOCATION:America/Cayenne
+BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:GFT
+TZOFFSETFROM:-032920
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19671001T000000
+RDATE:19671001T000000
+TZNAME:GFT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayman.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayman.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cayman.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120201T000000
-RDATE:19120201T000000
-TZNAME:EST
-TZOFFSETFROM:-050712
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Cayman
+X-LIC-LOCATION:America/Cayman
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KMT
+TZOFFSETFROM:-052532
+TZOFFSETTO:-050712
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120201T000000
+RDATE:19120201T000000
+TZNAME:EST
+TZOFFSETFROM:-050712
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chicago.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chicago.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chicago.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,177 +1,177 @@
-BEGIN:VCALENDAR
-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
-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
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19200613T020000
-RDATE:19200613T020000
-RDATE:19210327T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T020000
-RRULE:FREQ=YEARLY;UNTIL=19211030T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19220430T020000
-RRULE:FREQ=YEARLY;UNTIL=19350428T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19370926T020000
-RRULE:FREQ=YEARLY;UNTIL=19410928T070000Z;BYDAY=-1SU;BYMONTH=9
-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:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-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:19551030T020000
-RRULE:FREQ=YEARLY;UNTIL=19661030T070000Z;BYDAY=-1SU;BYMONTH=10
-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: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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19200613T020000
+RDATE:19200613T020000
+RDATE:19210327T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T020000
+RRULE:FREQ=YEARLY;UNTIL=19211030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19220430T020000
+RRULE:FREQ=YEARLY;UNTIL=19350428T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19370926T020000
+RRULE:FREQ=YEARLY;UNTIL=19410928T070000Z;BYDAY=-1SU;BYMONTH=9
+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:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+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:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T070000Z;BYDAY=-1SU;BYMONTH=10
+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: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/America/Chihuahua.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chihuahua.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Chihuahua.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,98 +1,98 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Chihuahua
-X-LIC-LOCATION:America/Chihuahua
-BEGIN:STANDARD
-DTSTART:19211231T235540
-RDATE:19211231T235540
-TZNAME:MST
-TZOFFSETFROM:-070420
-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;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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Chihuahua
+X-LIC-LOCATION:America/Chihuahua
+BEGIN:STANDARD
+DTSTART:19211231T235540
+RDATE:19211231T235540
+TZNAME:MST
+TZOFFSETFROM:-070420
+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;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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Coral_Harbour.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-TZNAME:CPT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:EST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Coral_Harbour
+X-LIC-LOCATION:America/Coral_Harbour
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CST
+TZOFFSETFROM:-060628
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cordoba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cordoba.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cordoba.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,165 +1,165 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Cordoba
-X-LIC-LOCATION:America/Cordoba
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-041648
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19921018T000000
-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=19900304T020000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0200
-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: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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Cordoba
+X-LIC-LOCATION:America/Cordoba
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-041648
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+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=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+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: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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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/Costa_Rica.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Costa_Rica.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Costa_Rica.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,52 +1,52 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790603T000000
-RRULE:FREQ=YEARLY;UNTIL=19800601T050000Z;BYDAY=1SU;BYMONTH=6
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19910119T000000
-RRULE:FREQ=YEARLY;UNTIL=19920118T060000Z;BYDAY=3SA;BYMONTH=1
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910701T000000
-RDATE:19910701T000000
-RDATE:19920315T000000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790603T000000
+RRULE:FREQ=YEARLY;UNTIL=19800601T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19910119T000000
+RRULE:FREQ=YEARLY;UNTIL=19920118T060000Z;BYDAY=3SA;BYMONTH=1
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910701T000000
+RDATE:19910701T000000
+RDATE:19920315T000000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cuiaba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cuiaba.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Cuiaba.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,182 +1,182 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Cuiaba
-X-LIC-LOCATION:America/Cuiaba
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:AMST
-TZOFFSETFROM:-034420
-TZOFFSETTO:-0400
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-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:DAYLIGHT
-DTSTART:19931017T000000
-RRULE:FREQ=YEARLY;UNTIL=19951015T040000Z;BYDAY=-3SU;BYMONTH=10
-TZNAME:AMST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19940220T000000
-RRULE:FREQ=YEARLY;UNTIL=19950219T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20001008T000000
-RRULE:FREQ=YEARLY;UNTIL=20011014T040000Z;BYDAY=2SU;BYMONTH=10
-TZNAME:AMST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010218T000000
-RRULE:FREQ=YEARLY;UNTIL=20030216T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20030924T000000
-RDATE:20030924T000000
-TZNAME:AMT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20041001T000000
-RDATE:20041001T000000
-TZNAME:AMST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20050220T000000
-RRULE:FREQ=YEARLY;UNTIL=20060219T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20080217T000000
-RRULE:FREQ=YEARLY;UNTIL=20110220T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
-TZNAME:AMST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20130217T000000
-RRULE:FREQ=YEARLY;UNTIL=20140216T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20160221T000000
-RRULE:FREQ=YEARLY;UNTIL=20170219T030000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Cuiaba
+X-LIC-LOCATION:America/Cuiaba
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-034420
+TZOFFSETTO:-0400
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+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:DAYLIGHT
+DTSTART:19931017T000000
+RRULE:FREQ=YEARLY;UNTIL=19951015T040000Z;BYDAY=-3SU;BYMONTH=10
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19940220T000000
+RRULE:FREQ=YEARLY;UNTIL=19950219T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20001008T000000
+RRULE:FREQ=YEARLY;UNTIL=20011014T040000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010218T000000
+RRULE:FREQ=YEARLY;UNTIL=20030216T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20030924T000000
+RDATE:20030924T000000
+TZNAME:AMT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20041001T000000
+RDATE:20041001T000000
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20050220T000000
+RRULE:FREQ=YEARLY;UNTIL=20060219T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;UNTIL=20110220T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
+TZNAME:AMST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;UNTIL=20140216T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;UNTIL=20170219T030000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:AMT
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Curacao.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19650101T000000
-RDATE:19650101T000000
-TZNAME:AST
-TZOFFSETFROM:-0430
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Curacao
+X-LIC-LOCATION:America/Curacao
+BEGIN:STANDARD
+DTSTART:19120212T000000
+RDATE:19120212T000000
+TZNAME:ANT
+TZOFFSETFROM:-043544
+TZOFFSETTO:-0430
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19650101T000000
+RDATE:19650101T000000
+TZNAME:AST
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Danmarkshavn.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Danmarkshavn.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Danmarkshavn.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,46 +1,46 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Danmarkshavn
-X-LIC-LOCATION:America/Danmarkshavn
-BEGIN:STANDARD
-DTSTART:19160728T000000
-RDATE:19160728T000000
-TZNAME:WGT
-TZOFFSETFROM:-011440
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800406T020000
-RDATE:19800406T020000
-TZNAME:WGST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19960101T000000
-RDATE:19960101T000000
-TZNAME:GMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Danmarkshavn
+X-LIC-LOCATION:America/Danmarkshavn
+BEGIN:STANDARD
+DTSTART:19160728T000000
+RDATE:19160728T000000
+TZNAME:WGT
+TZOFFSETFROM:-011440
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800406T020000
+RDATE:19800406T020000
+TZNAME:WGST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,110 +1,110 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Dawson
-X-LIC-LOCATION:America/Dawson
-BEGIN:STANDARD
-DTSTART:19000820T000000
-RDATE:19000820T000000
-TZNAME:YST
-TZOFFSETFROM:-091740
-TZOFFSETTO:-0900
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19190525T020000
-TZNAME:YDT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T150000
-RDATE:19450814T150000
-TZNAME:YPT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19650425T000000
-RDATE:19650425T000000
-TZNAME:YDDT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RDATE:19651031T020000
-TZNAME:YST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19731028T000000
-RDATE:19731028T000000
-TZNAME:PST
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Dawson
+X-LIC-LOCATION:America/Dawson
+BEGIN:STANDARD
+DTSTART:19000820T000000
+RDATE:19000820T000000
+TZNAME:YST
+TZOFFSETFROM:-091740
+TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19190525T020000
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T150000
+RDATE:19450814T150000
+TZNAME:YPT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:YDDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:YST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19731028T000000
+RDATE:19731028T000000
+TZNAME:PST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dawson_Creek.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,80 +1,80 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Dawson_Creek
-X-LIC-LOCATION:America/Dawson_Creek
-BEGIN:STANDARD
-DTSTART:18840101T000000
-RDATE:18840101T000000
-TZNAME:PST
-TZOFFSETFROM:-080056
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T160000
-RDATE:19450814T160000
-TZNAME:PPT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-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
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;UNTIL=19711031T090000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19720830T020000
-RDATE:19720830T020000
-TZNAME:MST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Dawson_Creek
+X-LIC-LOCATION:America/Dawson_Creek
+BEGIN:STANDARD
+DTSTART:18840101T000000
+RDATE:18840101T000000
+TZNAME:PST
+TZOFFSETFROM:-080056
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+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
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19711031T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Denver.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,134 +1,134 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T020000
-RDATE:19201031T020000
-RDATE:19210522T020000
-RDATE:19450930T020000
-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:DAYLIGHT
-DTSTART:19650425T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19210522T020000
+RDATE:19450930T020000
+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:DAYLIGHT
+DTSTART:19650425T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
+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/America/Detroit.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Detroit.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Detroit.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,115 +1,115 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Detroit
-X-LIC-LOCATION:America/Detroit
-BEGIN:STANDARD
-DTSTART:19050101T000000
-RDATE:19050101T000000
-TZNAME:CST
-TZOFFSETFROM:-053211
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19150515T020000
-RDATE:19150515T020000
-TZNAME:EST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T190000
-RDATE:19450814T190000
-TZNAME:EPT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:19480926T020000
-RDATE:19671029T020000
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Detroit
+X-LIC-LOCATION:America/Detroit
+BEGIN:STANDARD
+DTSTART:19050101T000000
+RDATE:19050101T000000
+TZNAME:CST
+TZOFFSETFROM:-053211
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19150515T020000
+RDATE:19150515T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19480926T020000
+RDATE:19671029T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Dominica.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Dominica
+X-LIC-LOCATION:America/Dominica
+BEGIN:STANDARD
+DTSTART:19110701T000100
+RDATE:19110701T000100
+TZNAME:AST
+TZOFFSETFROM:-040536
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Edmonton.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Edmonton.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Edmonton.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-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
-DTSTART:19180414T020000
-RRULE:FREQ=YEARLY;UNTIL=19190413T090000Z;BYDAY=2SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19200425T020000
-RRULE:FREQ=YEARLY;UNTIL=19230429T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;UNTIL=19230930T080000Z;BYDAY=-1SU;BYMONTH=9
-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:DAYLIGHT
-DTSTART:19470427T020000
-RDATE:19470427T020000
-RDATE:19670430T020000
-RDATE:19690427T020000
-TZNAME:MDT
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19721029T020000
-RRULE:FREQ=YEARLY;UNTIL=19861026T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19870101T000000
-RDATE:19870101T000000
-TZNAME:MST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+DTSTART:19180414T020000
+RRULE:FREQ=YEARLY;UNTIL=19190413T090000Z;BYDAY=2SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19200425T020000
+RRULE:FREQ=YEARLY;UNTIL=19230429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;UNTIL=19230930T080000Z;BYDAY=-1SU;BYMONTH=9
+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:DAYLIGHT
+DTSTART:19470427T020000
+RDATE:19470427T020000
+RDATE:19670430T020000
+RDATE:19690427T020000
+TZNAME:MDT
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19721029T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870101T000000
+RDATE:19870101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+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/Eirunepe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Eirunepe.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Eirunepe.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,102 +1,102 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Eirunepe
-X-LIC-LOCATION:America/Eirunepe
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:ACST
-TZOFFSETFROM:-043928
-TZOFFSETTO:-0500
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
-TZNAME:ACT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
-TZNAME:ACST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19500416T010000
-RDATE:19500416T010000
-RDATE:19530301T000000
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:19940220T000000
-TZNAME:ACT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-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:19940922T000000
-TZNAME:ACT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19930928T000000
-RDATE:19930928T000000
-TZNAME:ACST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20080624T000000
-RDATE:20080624T000000
-TZNAME:AMT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Eirunepe
+X-LIC-LOCATION:America/Eirunepe
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:ACST
+TZOFFSETFROM:-043928
+TZOFFSETTO:-0500
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
+TZNAME:ACST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19500416T010000
+RDATE:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19940220T000000
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+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:19940922T000000
+TZNAME:ACT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19930928T000000
+RDATE:19930928T000000
+TZNAME:ACST
+TZOFFSETFROM:-0500
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/El_Salvador.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19870927T000000
-RRULE:FREQ=YEARLY;UNTIL=19880925T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19870927T000000
+RRULE:FREQ=YEARLY;UNTIL=19880925T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ensenada.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ensenada.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ensenada.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,154 +1,154 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Ensenada
-X-LIC-LOCATION:America/Ensenada
-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;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;UNTIL=20090405T100000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-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
-DTSTART:20100314T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20101107T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Ensenada
+X-LIC-LOCATION:America/Ensenada
+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;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;UNTIL=20090405T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+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
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20101107T020000
+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/Fort_Wayne.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fort_Wayne.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fort_Wayne.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,142 +1,142 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Fort_Wayne
-X-LIC-LOCATION:America/Fort_Wayne
-BEGIN:STANDARD
-DTSTART:18831118T121522
-RDATE:18831118T121522
-TZNAME:CST
-TZOFFSETFROM:-054438
-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: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
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-TZNAME:CPT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-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
-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
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Fort_Wayne
+X-LIC-LOCATION:America/Fort_Wayne
+BEGIN:STANDARD
+DTSTART:18831118T121522
+RDATE:18831118T121522
+TZNAME:CST
+TZOFFSETFROM:-054438
+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: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
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Fortaleza.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,104 +1,104 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Fortaleza
-X-LIC-LOCATION:America/Fortaleza
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:BRST
-TZOFFSETFROM:-0234
-TZOFFSETTO:-0300
-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: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
-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:20000227T000000
-RDATE:20001022T000000
-RDATE:20020217T000000
-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:STANDARD
-DTSTART:19900917T000000
-RDATE:19900917T000000
-RDATE:20021001T000000
-TZNAME:BRT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19990930T000000
-RDATE:19990930T000000
-RDATE:20010913T000000
-TZNAME:BRST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Fortaleza
+X-LIC-LOCATION:America/Fortaleza
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-0234
+TZOFFSETTO:-0300
+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: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
+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:20000227T000000
+RDATE:20001022T000000
+RDATE:20020217T000000
+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:STANDARD
+DTSTART:19900917T000000
+RDATE:19900917T000000
+RDATE:20021001T000000
+TZNAME:BRT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990930T000000
+RDATE:19990930T000000
+RDATE:20010913T000000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Glace_Bay.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,106 +1,106 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Glace_Bay
-X-LIC-LOCATION:America/Glace_Bay
-BEGIN:STANDARD
-DTSTART:19020615T000000
-RDATE:19020615T000000
-TZNAME:AST
-TZOFFSETFROM:-035948
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19530426T020000
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
-RDATE:19530927T020000
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:AWT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T200000
-RDATE:19450814T200000
-TZNAME:APT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19530101T000000
-RDATE:19530101T000000
-RDATE:19540101T000000
-RDATE:19720101T000000
-RDATE:19740101T000000
-TZNAME:AST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-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
-DTSTART:19721029T020000
-RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:AST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19741027T020000
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Glace_Bay
+X-LIC-LOCATION:America/Glace_Bay
+BEGIN:STANDARD
+DTSTART:19020615T000000
+RDATE:19020615T000000
+TZNAME:AST
+TZOFFSETFROM:-035948
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19530426T020000
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+RDATE:19530927T020000
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19530101T000000
+RDATE:19530101T000000
+RDATE:19540101T000000
+RDATE:19720101T000000
+RDATE:19740101T000000
+TZNAME:AST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+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
+DTSTART:19721029T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19741027T020000
+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
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Godthab.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Godthab.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Godthab.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,45 +1,45 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Godthab
-X-LIC-LOCATION:America/Godthab
-BEGIN:STANDARD
-DTSTART:19160728T000000
-RDATE:19160728T000000
-TZNAME:WGT
-TZOFFSETFROM:-032656
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800406T020000
-RDATE:19800406T020000
-TZNAME:WGST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Godthab
+X-LIC-LOCATION:America/Godthab
+BEGIN:STANDARD
+DTSTART:19160728T000000
+RDATE:19160728T000000
+TZNAME:WGT
+TZOFFSETFROM:-032656
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800406T020000
+RDATE:19800406T020000
+TZNAME:WGST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Goose_Bay.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,203 +1,224 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;UNTIL=19650425T053000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:NDT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19590927T043000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19601030T020000
-RRULE:FREQ=YEARLY;UNTIL=19651031T043000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19660315T020000
-RDATE:19660315T020000
-TZNAME:AST
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19660424T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19661030T020000
-RRULE:FREQ=YEARLY;UNTIL=19861026T050000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T000100
-RDATE:19870405T000100
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19871025T000100
-RDATE:19871025T000100
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19880403T000100
-RDATE:19880403T000100
-TZNAME:ADDT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19881030T000100
-RDATE:19881030T000100
-TZNAME:AST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19890402T000100
-RRULE:FREQ=YEARLY;UNTIL=20060402T040100Z;BYDAY=1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19891029T000100
-RRULE:FREQ=YEARLY;UNTIL=20061029T030100Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20070311T000100
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T000100
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19650425T053000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T043000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19601030T020000
+RRULE:FREQ=YEARLY;UNTIL=19651031T043000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660315T020000
+RDATE:19660315T020000
+TZNAME:AST
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19660424T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19661030T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T000100
+RDATE:19870405T000100
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871025T000100
+RDATE:19871025T000100
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19880403T000100
+RDATE:19880403T000100
+TZNAME:ADDT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19881030T000100
+RDATE:19881030T000100
+TZNAME:AST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19890402T000100
+RRULE:FREQ=YEARLY;UNTIL=20060402T040100Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19891029T000100
+RRULE:FREQ=YEARLY;UNTIL=20061029T030100Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;UNTIL=20110313T040100Z;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;UNTIL=20101107T030100Z;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111101T000000
+RDATE:20111101T000000
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111106T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20120311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grand_Turk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grand_Turk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grand_Turk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19791028T020000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19791028T020000
+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
+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/Grenada.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grenada.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Grenada.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Grenada
+X-LIC-LOCATION:America/Grenada
+BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:AST
+TZOFFSETFROM:-0407
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guadeloupe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guadeloupe.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guadeloupe.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Guadeloupe
+X-LIC-LOCATION:America/Guadeloupe
+BEGIN:STANDARD
+DTSTART:19110608T000000
+RDATE:19110608T000000
+TZNAME:AST
+TZOFFSETFROM:-040608
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guatemala.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guatemala.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guatemala.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,36 +1,36 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19731125T000000
-RDATE:19731125T000000
-RDATE:19830521T000000
-RDATE:19910323T000000
-RDATE:20060430T000000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19740224T000000
-RDATE:19740224T000000
-RDATE:19830922T000000
-RDATE:19910907T000000
-RDATE:20061001T000000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Guatemala
+X-LIC-LOCATION:America/Guatemala
+BEGIN:STANDARD
+DTSTART:19181005T000000
+RDATE:19181005T000000
+TZNAME:CST
+TZOFFSETFROM:-060204
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19731125T000000
+RDATE:19731125T000000
+RDATE:19830521T000000
+RDATE:19910323T000000
+RDATE:20060430T000000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guayaquil.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19310101T000000
-RDATE:19310101T000000
-TZNAME:ECT
-TZOFFSETFROM:-0514
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Guayaquil
+X-LIC-LOCATION:America/Guayaquil
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:QMT
+TZOFFSETFROM:-051920
+TZOFFSETTO:-0514
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:ECT
+TZOFFSETFROM:-0514
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guyana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guyana.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Guyana.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19660526T000000
-RDATE:19660526T000000
-TZNAME:GYT
-TZOFFSETFROM:-0345
-TZOFFSETTO:-0345
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19750731T000000
-RDATE:19750731T000000
-TZNAME:GYT
-TZOFFSETFROM:-0345
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910101T000000
-RDATE:19910101T000000
-TZNAME:GYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Guyana
+X-LIC-LOCATION:America/Guyana
+BEGIN:STANDARD
+DTSTART:19150301T000000
+RDATE:19150301T000000
+TZNAME:GBGT
+TZOFFSETFROM:-035240
+TZOFFSETTO:-0345
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660526T000000
+RDATE:19660526T000000
+TZNAME:GYT
+TZOFFSETFROM:-0345
+TZOFFSETTO:-0345
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19750731T000000
+RDATE:19750731T000000
+TZNAME:GYT
+TZOFFSETFROM:-0345
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+TZNAME:GYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Halifax.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Halifax.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Halifax.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,221 +1,221 @@
-BEGIN:VCALENDAR
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19210905T000000
-RRULE:FREQ=YEARLY;UNTIL=19220905T030000Z;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19230506T000000
-RRULE:FREQ=YEARLY;UNTIL=19250503T040000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19280513T000000
-RRULE:FREQ=YEARLY;UNTIL=19310510T040000Z;BYDAY=2SU;BYMONTH=5
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19310928T000000
-RRULE:FREQ=YEARLY;UNTIL=19320926T030000Z;BYDAY=-1MO;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19370502T000000
-RRULE:FREQ=YEARLY;UNTIL=19380501T040000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19370927T000000
-RRULE:FREQ=YEARLY;UNTIL=19410929T030000Z;BYDAY=-1MO;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400505T000000
-RRULE:FREQ=YEARLY;UNTIL=19410504T040000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:AWT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T200000
-RDATE:19450814T200000
-TZNAME:APT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19490424T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;UNTIL=19490925T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;UNTIL=19540425T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19540926T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19560429T020000
-RRULE:FREQ=YEARLY;UNTIL=19590426T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19560930T020000
-RRULE:FREQ=YEARLY;UNTIL=19590927T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19620429T020000
-RRULE:FREQ=YEARLY;UNTIL=19730429T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:AST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19741027T020000
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19210905T000000
+RRULE:FREQ=YEARLY;UNTIL=19220905T030000Z;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19230506T000000
+RRULE:FREQ=YEARLY;UNTIL=19250503T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19280513T000000
+RRULE:FREQ=YEARLY;UNTIL=19310510T040000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19310928T000000
+RRULE:FREQ=YEARLY;UNTIL=19320926T030000Z;BYDAY=-1MO;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19370502T000000
+RRULE:FREQ=YEARLY;UNTIL=19380501T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19370927T000000
+RRULE:FREQ=YEARLY;UNTIL=19410929T030000Z;BYDAY=-1MO;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400505T000000
+RRULE:FREQ=YEARLY;UNTIL=19410504T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19490424T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19490925T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;UNTIL=19590426T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19560930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19620429T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19741027T020000
+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
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Havana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Havana.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Havana.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,190 +1,198 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19281010T000000
-RDATE:19281010T000000
-RDATE:19650930T000000
-RDATE:19661002T000000
-RDATE:19961006T010000
-RDATE:19971012T010000
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400602T000000
-RRULE:FREQ=YEARLY;UNTIL=19420607T050000Z;BYDAY=1SU;BYMONTH=6
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19400901T000000
-RRULE:FREQ=YEARLY;UNTIL=19420906T040000Z;BYDAY=1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19670910T000000
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19691026T000000
-RRULE:FREQ=YEARLY;UNTIL=19711031T040000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19721008T000000
-RRULE:FREQ=YEARLY;UNTIL=19741008T040000Z;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19751026T000000
-RRULE:FREQ=YEARLY;UNTIL=19771030T040000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19781008T000000
-RRULE:FREQ=YEARLY;UNTIL=19901014T040000Z;BYDAY=2SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19790318T000000
-RRULE:FREQ=YEARLY;UNTIL=19800316T050000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19900401T000000
-RRULE:FREQ=YEARLY;UNTIL=19970406T050000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19911013T010000
-RRULE:FREQ=YEARLY;UNTIL=19951008T050000Z;BYDAY=2SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19980329T000000
-RRULE:FREQ=YEARLY;UNTIL=19990328T050000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19981025T010000
-RRULE:FREQ=YEARLY;UNTIL=20031026T050000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20000402T000000
-RRULE:FREQ=YEARLY;UNTIL=20040404T050000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20061029T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20090308T000000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+RDATE:20110320T000000
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19281010T000000
+RDATE:19281010T000000
+RDATE:19650930T000000
+RDATE:19661002T000000
+RDATE:19961006T010000
+RDATE:19971012T010000
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400602T000000
+RRULE:FREQ=YEARLY;UNTIL=19420607T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400901T000000
+RRULE:FREQ=YEARLY;UNTIL=19420906T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19670910T000000
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T000000
+RRULE:FREQ=YEARLY;UNTIL=19711031T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19721008T000000
+RRULE:FREQ=YEARLY;UNTIL=19741008T040000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19751026T000000
+RRULE:FREQ=YEARLY;UNTIL=19771030T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19781008T000000
+RRULE:FREQ=YEARLY;UNTIL=19901014T040000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19790318T000000
+RRULE:FREQ=YEARLY;UNTIL=19800316T050000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+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
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19900401T000000
+RRULE:FREQ=YEARLY;UNTIL=19970406T050000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911013T010000
+RRULE:FREQ=YEARLY;UNTIL=19951008T050000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19980329T000000
+RRULE:FREQ=YEARLY;UNTIL=19990328T050000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19981025T010000
+RRULE:FREQ=YEARLY;UNTIL=20031026T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000402T000000
+RRULE:FREQ=YEARLY;UNTIL=20040404T050000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20061029T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20090308T000000
+RRULE:FREQ=YEARLY;UNTIL=20100314T050000Z;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20120311T000000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Hermosillo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Hermosillo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Hermosillo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,69 +1,69 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Hermosillo
-X-LIC-LOCATION:America/Hermosillo
-BEGIN:STANDARD
-DTSTART:19211231T233608
-RDATE:19211231T233608
-TZNAME:MST
-TZOFFSETFROM:-072352
-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
-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=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
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19990101T000000
-RDATE:19990101T000000
-TZNAME:MST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Hermosillo
+X-LIC-LOCATION:America/Hermosillo
+BEGIN:STANDARD
+DTSTART:19211231T233608
+RDATE:19211231T233608
+TZNAME:MST
+TZOFFSETFROM:-072352
+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
+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=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
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990101T000000
+RDATE:19990101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Indianapolis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Indianapolis.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Indianapolis.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,142 +1,142 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Indiana/Indianapolis
-X-LIC-LOCATION:America/Indiana/Indianapolis
-BEGIN:STANDARD
-DTSTART:18831118T121522
-RDATE:18831118T121522
-TZNAME:CST
-TZOFFSETFROM:-054438
-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: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
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-TZNAME:CPT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-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
-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
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Indiana/Indianapolis
+X-LIC-LOCATION:America/Indiana/Indianapolis
+BEGIN:STANDARD
+DTSTART:18831118T121522
+RDATE:18831118T121522
+TZNAME:CST
+TZOFFSETFROM:-054438
+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: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
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Knox.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,166 +1,166 @@
-BEGIN:VCALENDAR
-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
-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
-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;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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19570929T020000
-RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19591025T020000
-RRULE:FREQ=YEARLY;UNTIL=19611029T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;UNTIL=19901028T070000Z;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=19910407T080000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19911027T020000
-RDATE:19911027T020000
-TZNAME:EST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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;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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19591025T020000
+RRULE:FREQ=YEARLY;UNTIL=19611029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19901028T070000Z;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=19910407T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911027T020000
+RDATE:19911027T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+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/Marengo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Marengo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Marengo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,148 +1,148 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Indiana/Marengo
-X-LIC-LOCATION:America/Indiana/Marengo
-BEGIN:STANDARD
-DTSTART:18831118T121437
-RDATE:18831118T121437
-TZNAME:CST
-TZOFFSETFROM:-054523
-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
-RDATE:19510930T020000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19510101T000000
-RDATE:19510101T000000
-TZNAME:CST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19740106T020000
-RDATE:19740106T020000
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19750223T020000
-RDATE:19750223T020000
-RDATE:20060402T020000
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Indiana/Marengo
+X-LIC-LOCATION:America/Indiana/Marengo
+BEGIN:STANDARD
+DTSTART:18831118T121437
+RDATE:18831118T121437
+TZNAME:CST
+TZOFFSETFROM:-054523
+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
+RDATE:19510930T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740106T020000
+RDATE:19740106T020000
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19750223T020000
+RDATE:19750223T020000
+RDATE:20060402T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Petersburg.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,148 +1,148 @@
-BEGIN:VCALENDAR
-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
-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
-RDATE:19661030T020000
-RDATE:20061029T020000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19550101T000000
-RDATE:19550101T000000
-TZNAME:CST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19550501T000000
-RDATE:19550501T000000
-RDATE:19740106T020000
-RDATE:19750223T020000
-RDATE:20070311T020000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19550925T020000
-RRULE:FREQ=YEARLY;UNTIL=19600925T070000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19560429T020000
-RRULE:FREQ=YEARLY;UNTIL=19640426T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19611029T020000
-RRULE:FREQ=YEARLY;UNTIL=19641025T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19650425T020000
-RDATE:19650425T020000
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;UNTIL=19761031T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;UNTIL=19770424T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19771030T020000
-RDATE:19771030T020000
-RDATE:20071104T020000
-TZNAME:EST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+RDATE:19661030T020000
+RDATE:20061029T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19550101T000000
+RDATE:19550101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19550501T000000
+RDATE:19550501T000000
+RDATE:19740106T020000
+RDATE:19750223T020000
+RDATE:20070311T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19550925T020000
+RRULE:FREQ=YEARLY;UNTIL=19600925T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;UNTIL=19640426T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19611029T020000
+RRULE:FREQ=YEARLY;UNTIL=19641025T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19650425T020000
+RDATE:19650425T020000
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19761031T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19770424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19771030T020000
+RDATE:19771030T020000
+RDATE:20071104T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+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/Tell_City.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Tell_City.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Tell_City.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,148 +1,148 @@
-BEGIN:VCALENDAR
-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:STANDARD
-DTSTART:18831118T121257
-RDATE:18831118T121257
-TZNAME:CST
-TZOFFSETFROM:-054703
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19460428T020000
-RDATE:19460428T020000
-RDATE:19550501T000000
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Indiana/Tell_City
+X-LIC-LOCATION:America/Indiana/Tell_City
+BEGIN:STANDARD
+DTSTART:18831118T121257
+RDATE:18831118T121257
+TZNAME:CST
+TZOFFSETFROM:-054703
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RDATE:19460428T020000
+RDATE:19550501T000000
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vevay.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,109 +1,109 @@
-BEGIN:VCALENDAR
-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
-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:STANDARD
-DTSTART:19540425T020000
-RDATE:19540425T020000
-TZNAME:EST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-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
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:STANDARD
+DTSTART:19540425T020000
+RDATE:19540425T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Vincennes.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,150 +1,150 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Indiana/Vincennes
-X-LIC-LOCATION:America/Indiana/Vincennes
-BEGIN:STANDARD
-DTSTART:18831118T120953
-RDATE:18831118T120953
-TZNAME:CST
-TZOFFSETFROM:-055007
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Indiana/Vincennes
+X-LIC-LOCATION:America/Indiana/Vincennes
+BEGIN:STANDARD
+DTSTART:18831118T120953
+RDATE:18831118T120953
+TZNAME:CST
+TZOFFSETFROM:-055007
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indiana/Winamac.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,144 +1,144 @@
-BEGIN:VCALENDAR
-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
-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
-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;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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19570929T020000
-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
-END:STANDARD
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20060402T020000
-RDATE:20060402T020000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20070311T020000
-RDATE:20070311T020000
-TZNAME:EST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20080309T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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;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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570929T020000
+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
+END:STANDARD
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20060402T020000
+RDATE:20060402T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20070311T020000
+RDATE:20070311T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20080309T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indianapolis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indianapolis.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Indianapolis.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,142 +1,142 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Indianapolis
-X-LIC-LOCATION:America/Indianapolis
-BEGIN:STANDARD
-DTSTART:18831118T121522
-RDATE:18831118T121522
-TZNAME:CST
-TZOFFSETFROM:-054438
-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: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
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-TZNAME:CPT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-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
-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
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Indianapolis
+X-LIC-LOCATION:America/Indianapolis
+BEGIN:STANDARD
+DTSTART:18831118T121522
+RDATE:18831118T121522
+TZNAME:CST
+TZOFFSETFROM:-054438
+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: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
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Inuvik.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,79 +1,79 @@
-BEGIN:VCALENDAR
-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
-DTSTART:19650425T000000
-RDATE:19650425T000000
-TZNAME:PDDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0600
-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
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:PDDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0600
+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
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+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/America/Iqaluit.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Iqaluit.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Iqaluit.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,114 +1,114 @@
-BEGIN:VCALENDAR
-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
-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:19650425T000000
-RDATE:19650425T000000
-TZNAME:EDDT
-TZOFFSETFROM:-0500
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;UNTIL=19981025T060000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;UNTIL=19990404T070000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:19650425T000000
+RDATE:19650425T000000
+TZNAME:EDDT
+TZOFFSETFROM:-0500
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19981025T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19990404T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+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
+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
+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/Jamaica.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jamaica.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jamaica.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Jamaica
-X-LIC-LOCATION:America/Jamaica
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:KMT
-TZOFFSETFROM:-050712
-TZOFFSETTO:-050712
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120201T000000
-RDATE:19120201T000000
-TZNAME:EST
-TZOFFSETFROM:-050712
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19740428T020000
-RDATE:19740428T020000
-TZNAME:EST
-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
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840101T000000
-RDATE:19840101T000000
-TZNAME:EST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Jamaica
+X-LIC-LOCATION:America/Jamaica
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KMT
+TZOFFSETFROM:-050712
+TZOFFSETTO:-050712
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120201T000000
+RDATE:19120201T000000
+TZNAME:EST
+TZOFFSETFROM:-050712
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740428T020000
+RDATE:19740428T020000
+TZNAME:EST
+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
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840101T000000
+RDATE:19840101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jujuy.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jujuy.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Jujuy.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,174 +1,174 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Jujuy
-X-LIC-LOCATION:America/Jujuy
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-042112
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19891015T000000
-RDATE:19921018T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T000000
-RDATE:19901028T000000
-TZNAME:WARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910317T000000
-RDATE:19910317T000000
-TZNAME:WART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19911006T000000
-RDATE:19911006T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920101T000000
-RDATE:19920101T000000
-TZNAME:ARST
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20081018T000000
-RDATE:20081018T000000
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Jujuy
+X-LIC-LOCATION:America/Jujuy
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-042112
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19891015T000000
+RDATE:19921018T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T000000
+RDATE:19901028T000000
+TZNAME:WARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910317T000000
+RDATE:19910317T000000
+TZNAME:WART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19911006T000000
+RDATE:19911006T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
+TZNAME:ARST
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20081018T000000
+RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Juneau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Juneau.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Juneau.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,124 +1,146 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Juneau
-X-LIC-LOCATION:America/Juneau
-BEGIN:STANDARD
-DTSTART:19000820T120000
-RDATE:19000820T120000
-TZNAME:PST
-TZOFFSETFROM:-085741
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-RDATE:19690101T000000
-TZNAME:PST
-TZOFFSETFROM:-0800
-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:19690427T020000
-RRULE:FREQ=YEARLY;UNTIL=19730429T100000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Juneau
+X-LIC-LOCATION:America/Juneau
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:PST
+TZOFFSETFROM:-085741
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19690101T000000
+RDATE:19801026T020000
+TZNAME:PST
+TZOFFSETFROM:-0800
+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:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19791028T090000Z;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=19790429T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19800427T020000
+RDATE:19800427T020000
+TZNAME:YST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810426T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811025T020000
+RRULE:FREQ=YEARLY;UNTIL=19821031T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Louisville.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,185 +1,185 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;UNTIL=19610430T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19561028T020000
-RRULE:FREQ=YEARLY;UNTIL=19601030T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19681027T020000
-RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19740106T020000
-RDATE:19740106T020000
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19750223T020000
-RDATE:19750223T020000
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19610430T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19561028T020000
+RRULE:FREQ=YEARLY;UNTIL=19601030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740106T020000
+RDATE:19740106T020000
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19750223T020000
+RDATE:19750223T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+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/Kentucky/Monticello.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Monticello.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kentucky/Monticello.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,130 +1,130 @@
-BEGIN:VCALENDAR
-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
-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: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;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
-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=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: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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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: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;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
+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=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: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
+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/Knox_IN.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Knox_IN.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Knox_IN.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,166 +1,166 @@
-BEGIN:VCALENDAR
-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
-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
-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;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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19570929T020000
-RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19591025T020000
-RRULE:FREQ=YEARLY;UNTIL=19611029T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;UNTIL=19901028T070000Z;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=19910407T080000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19911027T020000
-RDATE:19911027T020000
-TZNAME:EST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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;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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19591025T020000
+RRULE:FREQ=YEARLY;UNTIL=19611029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19901028T070000Z;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=19910407T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911027T020000
+RDATE:19911027T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+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

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kralendijk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kralendijk.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Kralendijk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -0,0 +1,23 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Kralendijk
+X-LIC-LOCATION:America/Kralendijk
+BEGIN:STANDARD
+DTSTART:19120212T000000
+RDATE:19120212T000000
+TZNAME:ANT
+TZOFFSETFROM:-043544
+TZOFFSETTO:-0430
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19650101T000000
+RDATE:19650101T000000
+TZNAME:AST
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/La_Paz.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/La_Paz.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/La_Paz.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19311015T000000
-RDATE:19311015T000000
-TZNAME:BOST
-TZOFFSETFROM:-043236
-TZOFFSETTO:-033236
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19320321T000000
-RDATE:19320321T000000
-TZNAME:BOT
-TZOFFSETFROM:-033236
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/La_Paz
+X-LIC-LOCATION:America/La_Paz
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
+TZOFFSETFROM:-043236
+TZOFFSETTO:-043236
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19311015T000000
+RDATE:19311015T000000
+TZNAME:BOST
+TZOFFSETFROM:-043236
+TZOFFSETTO:-033236
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19320321T000000
+RDATE:19320321T000000
+TZNAME:BOT
+TZOFFSETFROM:-033236
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lima.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lima.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lima.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,63 +1,63 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19380401T000000
-RDATE:19380401T000000
-RDATE:19900401T000000
-RDATE:19940401T000000
-TZNAME:PET
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19380925T000000
-RRULE:FREQ=YEARLY;UNTIL=19390924T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:PEST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19860101T000000
-RRULE:FREQ=YEARLY;UNTIL=19870101T050000Z;BYMONTH=1
-TZNAME:PEST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19860401T000000
-RRULE:FREQ=YEARLY;UNTIL=19870401T040000Z;BYMONTH=4
-TZNAME:PET
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19380401T000000
+RDATE:19380401T000000
+RDATE:19900401T000000
+RDATE:19940401T000000
+TZNAME:PET
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19380925T000000
+RRULE:FREQ=YEARLY;UNTIL=19390924T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PEST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19860101T000000
+RRULE:FREQ=YEARLY;UNTIL=19870101T050000Z;BYMONTH=1
+TZNAME:PEST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19860401T000000
+RRULE:FREQ=YEARLY;UNTIL=19870401T040000Z;BYMONTH=4
+TZNAME:PET
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Los_Angeles.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Los_Angeles.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Los_Angeles.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,132 +1,132 @@
-BEGIN:VCALENDAR
-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
-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
-RDATE:19490101T020000
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
-TZNAME:PST
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19480314T020000
-RDATE:19480314T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19500430T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T100000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19500924T020000
-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=19661030T090000Z;BYDAY=-1SU;BYMONTH=10
-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: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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+RDATE:19490101T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19480314T020000
+RDATE:19480314T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19500430T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19500924T020000
+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=19661030T090000Z;BYDAY=-1SU;BYMONTH=10
+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: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/America/Louisville.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Louisville.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Louisville.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,185 +1,185 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;UNTIL=19610430T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19561028T020000
-RRULE:FREQ=YEARLY;UNTIL=19601030T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19681027T020000
-RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19740106T020000
-RDATE:19740106T020000
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19750223T020000
-RDATE:19750223T020000
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19610430T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19561028T020000
+RRULE:FREQ=YEARLY;UNTIL=19601030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740106T020000
+RDATE:19740106T020000
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19750223T020000
+RDATE:19750223T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+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

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lower_Princes.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lower_Princes.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Lower_Princes.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -0,0 +1,23 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Lower_Princes
+X-LIC-LOCATION:America/Lower_Princes
+BEGIN:STANDARD
+DTSTART:19120212T000000
+RDATE:19120212T000000
+TZNAME:ANT
+TZOFFSETFROM:-043544
+TZOFFSETTO:-0430
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19650101T000000
+RDATE:19650101T000000
+TZNAME:AST
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Maceio.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Maceio.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Maceio.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,108 +1,108 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Maceio
-X-LIC-LOCATION:America/Maceio
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:BRST
-TZOFFSETFROM:-022252
-TZOFFSETTO:-0300
-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: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
-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:19960211T000000
-RDATE:20000227T000000
-RDATE:20001022T000000
-RDATE:20020217T000000
-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:STANDARD
-DTSTART:19900917T000000
-RDATE:19900917T000000
-RDATE:19960904T000000
-RDATE:20021001T000000
-TZNAME:BRT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19951013T000000
-RDATE:19951013T000000
-RDATE:19990930T000000
-RDATE:20010913T000000
-TZNAME:BRST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Maceio
+X-LIC-LOCATION:America/Maceio
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-022252
+TZOFFSETTO:-0300
+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: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
+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:19960211T000000
+RDATE:20000227T000000
+RDATE:20001022T000000
+RDATE:20020217T000000
+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:STANDARD
+DTSTART:19900917T000000
+RDATE:19900917T000000
+RDATE:19960904T000000
+RDATE:20021001T000000
+TZNAME:BRT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19951013T000000
+RDATE:19951013T000000
+RDATE:19990930T000000
+RDATE:20010913T000000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Managua.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,67 +1,67 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Managua
-X-LIC-LOCATION:America/Managua
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:MMT
-TZOFFSETFROM:-054508
-TZOFFSETTO:-054512
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19340623T000000
-RDATE:19340623T000000
-TZNAME:CST
-TZOFFSETFROM:-054512
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19730501T000000
-RDATE:19730501T000000
-RDATE:19920101T040000
-RDATE:19930101T000000
-TZNAME:EST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Managua
+X-LIC-LOCATION:America/Managua
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:MMT
+TZOFFSETFROM:-054508
+TZOFFSETTO:-054512
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19340623T000000
+RDATE:19340623T000000
+TZNAME:CST
+TZOFFSETFROM:-054512
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19730501T000000
+RDATE:19730501T000000
+RDATE:19920101T040000
+RDATE:19930101T000000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Manaus.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,95 +1,95 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Manaus
-X-LIC-LOCATION:America/Manaus
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:AMST
-TZOFFSETFROM:-040004
-TZOFFSETTO:-0400
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:19940220T000000
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-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: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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Manaus
+X-LIC-LOCATION:America/Manaus
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-040004
+TZOFFSETTO:-0400
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19940220T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+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: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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Marigot.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Marigot
+X-LIC-LOCATION:America/Marigot
+BEGIN:STANDARD
+DTSTART:19110608T000000
+RDATE:19110608T000000
+TZNAME:AST
+TZOFFSETFROM:-040608
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Martinique.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Martinique.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Martinique.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110501T000000
-RDATE:19110501T000000
-TZNAME:AST
-TZOFFSETFROM:-040420
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800406T000000
-RDATE:19800406T000000
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800928T000000
-RDATE:19800928T000000
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Martinique
+X-LIC-LOCATION:America/Martinique
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:FFMT
+TZOFFSETFROM:-040420
+TZOFFSETTO:-040420
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110501T000000
+RDATE:19110501T000000
+TZNAME:AST
+TZOFFSETFROM:-040420
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800406T000000
+RDATE:19800406T000000
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T000000
+RDATE:19800928T000000
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Matamoros.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Matamoros.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Matamoros.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,83 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mazatlan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,84 +1,84 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Mazatlan
-X-LIC-LOCATION:America/Mazatlan
-BEGIN:STANDARD
-DTSTART:19211231T235420
-RDATE:19211231T235420
-TZNAME:MST
-TZOFFSETFROM:-070540
-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;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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Mazatlan
+X-LIC-LOCATION:America/Mazatlan
+BEGIN:STANDARD
+DTSTART:19211231T235420
+RDATE:19211231T235420
+TZNAME:MST
+TZOFFSETFROM:-070540
+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;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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mendoza.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,164 +1,164 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Mendoza
-X-LIC-LOCATION:America/Mendoza
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-043516
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-RDATE:20040926T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19891015T000000
-RDATE:20071230T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19740501T000000
-RDATE:19740501T000000
-RDATE:19890305T000000
-RDATE:19930307T000000
-RDATE:20080316T000000
-TZNAME:ART
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900304T000000
-RDATE:19900304T000000
-TZNAME:WART
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901015T000000
-RDATE:19901015T000000
-RDATE:19911015T000000
-TZNAME:WARST
-TZOFFSETFROM:-0400
-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
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19991003T000000
-RDATE:19991003T000000
-TZNAME:ARST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20000303T000000
-RDATE:20000303T000000
-RDATE:20081018T000000
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Mendoza
+X-LIC-LOCATION:America/Mendoza
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-043516
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+RDATE:20040926T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19891015T000000
+RDATE:20071230T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19740501T000000
+RDATE:19740501T000000
+RDATE:19890305T000000
+RDATE:19930307T000000
+RDATE:20080316T000000
+TZNAME:ART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900304T000000
+RDATE:19900304T000000
+TZNAME:WART
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901015T000000
+RDATE:19901015T000000
+RDATE:19911015T000000
+TZNAME:WARST
+TZOFFSETFROM:-0400
+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
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991003T000000
+RDATE:19991003T000000
+TZNAME:ARST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000303T000000
+RDATE:20000303T000000
+RDATE:20081018T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Menominee.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Menominee.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Menominee.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,119 +1,119 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Menominee
-X-LIC-LOCATION:America/Menominee
-BEGIN:STANDARD
-DTSTART:18850918T120000
-RDATE:18850918T120000
-TZNAME:CST
-TZOFFSETFROM:-055027
-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
-RDATE:19460929T020000
-RDATE:19661030T020000
-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
-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
-END:STANDARD
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Menominee
+X-LIC-LOCATION:America/Menominee
+BEGIN:STANDARD
+DTSTART:18850918T120000
+RDATE:18850918T120000
+TZNAME:CST
+TZOFFSETFROM:-055027
+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
+RDATE:19460929T020000
+RDATE:19661030T020000
+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
+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
+END:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Merida.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,66 +1,66 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Merida
-X-LIC-LOCATION:America/Merida
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821202T000000
-RDATE:19821202T000000
-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:20010506T020000
-RDATE:20010506T020000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Merida
+X-LIC-LOCATION:America/Merida
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821202T000000
+RDATE:19821202T000000
+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:20010506T020000
+RDATE:20010506T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+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
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Metlakatla.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Metlakatla.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Metlakatla.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -0,0 +1,82 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Metlakatla
+X-LIC-LOCATION:America/Metlakatla
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:PST
+TZOFFSETFROM:-084618
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19690101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+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:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+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
+DTSTART:19831030T020000
+RDATE:19831030T020000
+TZNAME:MeST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mexico_City.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mexico_City.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Mexico_City.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,96 +1,96 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Mexico_City
-X-LIC-LOCATION:America/Mexico_City
-BEGIN:STANDARD
-DTSTART:19220101T002324
-RDATE:19220101T002324
-TZNAME:MST
-TZOFFSETFROM:-063636
-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
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19390205T000000
-RDATE:19390205T000000
-RDATE:19401209T000000
-RDATE:19500212T000000
-RDATE:20010506T020000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-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
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Mexico_City
+X-LIC-LOCATION:America/Mexico_City
+BEGIN:STANDARD
+DTSTART:19220101T002324
+RDATE:19220101T002324
+TZNAME:MST
+TZOFFSETFROM:-063636
+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
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19390205T000000
+RDATE:19390205T000000
+RDATE:19401209T000000
+RDATE:19500212T000000
+RDATE:20010506T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+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
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Miquelon.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T040000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:PMST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:PMDT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:PMST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PMST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PMDT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PMST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Moncton.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Moncton.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Moncton.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,173 +1,173 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19330910T010000
-RRULE:FREQ=YEARLY;UNTIL=19350908T040000Z;BYDAY=2SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19360607T010000
-RRULE:FREQ=YEARLY;UNTIL=19380605T050000Z;BYDAY=1SU;BYMONTH=6
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19360906T010000
-RRULE:FREQ=YEARLY;UNTIL=19380904T040000Z;BYDAY=1SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:AWT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T200000
-RDATE:19450814T200000
-TZNAME:APT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19720430T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;UNTIL=19921025T050000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19330910T010000
+RRULE:FREQ=YEARLY;UNTIL=19350908T040000Z;BYDAY=2SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19360607T010000
+RRULE:FREQ=YEARLY;UNTIL=19380605T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19360906T010000
+RRULE:FREQ=YEARLY;UNTIL=19380904T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19720430T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=19921025T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Monterrey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Monterrey.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Monterrey.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,68 +1,68 @@
-BEGIN:VCALENDAR
-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
-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;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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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;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/Montevideo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montevideo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montevideo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,196 +1,196 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Montevideo
-X-LIC-LOCATION:America/Montevideo
-BEGIN:STANDARD
-DTSTART:18980628T000000
-RDATE:18980628T000000
-TZNAME:MMT
-TZOFFSETFROM:-034444
-TZOFFSETTO:-034444
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:UYST
-TZOFFSETFROM:-034444
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19231002T000000
-RDATE:19231002T000000
-RDATE:19361101T000000
-RDATE:19410801T000000
-TZNAME:UYHST
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19240401T000000
-RRULE:FREQ=YEARLY;UNTIL=19260401T030000Z;BYMONTH=4
-TZNAME:UYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19241001T000000
-RRULE:FREQ=YEARLY;UNTIL=19251001T033000Z;BYMONTH=10
-TZNAME:UYHST
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19331029T000000
-RRULE:FREQ=YEARLY;UNTIL=19351027T033000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:UYHST
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19340401T000000
-RRULE:FREQ=YEARLY;UNTIL=19360329T030000Z;BYDAY=SU;BYMONTHDAY=26,27,28,29,3
- 0,31,32;BYMONTH=3
-TZNAME:UYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19370328T000000
-RRULE:FREQ=YEARLY;UNTIL=19410330T030000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:UYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19371031T000000
-RRULE:FREQ=YEARLY;UNTIL=19401027T033000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:UYHST
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19420101T000000
-RDATE:19420101T000000
-TZNAME:UYT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421214T000000
-RDATE:19421214T000000
-TZNAME:UYST
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19430314T000000
-RDATE:19430314T000000
-RDATE:19591115T000000
-RDATE:19600306T000000
-RDATE:19650926T000000
-RDATE:19720815T000000
-RDATE:19761001T000000
-RDATE:19780401T000000
-RDATE:19800501T000000
-RDATE:19880314T000000
-RDATE:19890312T000000
-RDATE:19930228T000000
-RDATE:20050327T020000
-RDATE:20060312T020000
-TZNAME:UYT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19590524T000000
-RDATE:19590524T000000
-RDATE:19600117T000000
-RDATE:19720424T000000
-RDATE:19771204T000000
-RDATE:19791001T000000
-RDATE:19871214T000000
-RDATE:19881211T000000
-RDATE:19891029T000000
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Montevideo
+X-LIC-LOCATION:America/Montevideo
+BEGIN:STANDARD
+DTSTART:18980628T000000
+RDATE:18980628T000000
+TZNAME:MMT
+TZOFFSETFROM:-034444
+TZOFFSETTO:-034444
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:UYST
+TZOFFSETFROM:-034444
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19231002T000000
+RDATE:19231002T000000
+RDATE:19361101T000000
+RDATE:19410801T000000
+TZNAME:UYHST
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19240401T000000
+RRULE:FREQ=YEARLY;UNTIL=19260401T030000Z;BYMONTH=4
+TZNAME:UYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19241001T000000
+RRULE:FREQ=YEARLY;UNTIL=19251001T033000Z;BYMONTH=10
+TZNAME:UYHST
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19331029T000000
+RRULE:FREQ=YEARLY;UNTIL=19351027T033000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:UYHST
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19340401T000000
+RRULE:FREQ=YEARLY;UNTIL=19360329T030000Z;BYDAY=SU;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:UYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19370328T000000
+RRULE:FREQ=YEARLY;UNTIL=19410330T030000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:UYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19371031T000000
+RRULE:FREQ=YEARLY;UNTIL=19401027T033000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:UYHST
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+TZNAME:UYT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421214T000000
+RDATE:19421214T000000
+TZNAME:UYST
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19430314T000000
+RDATE:19430314T000000
+RDATE:19591115T000000
+RDATE:19600306T000000
+RDATE:19650926T000000
+RDATE:19720815T000000
+RDATE:19761001T000000
+RDATE:19780401T000000
+RDATE:19800501T000000
+RDATE:19880314T000000
+RDATE:19890312T000000
+RDATE:19930228T000000
+RDATE:20050327T020000
+RDATE:20060312T020000
+TZNAME:UYT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19590524T000000
+RDATE:19590524T000000
+RDATE:19600117T000000
+RDATE:19720424T000000
+RDATE:19771204T000000
+RDATE:19791001T000000
+RDATE:19871214T000000
+RDATE:19881211T000000
+RDATE:19891029T000000
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montreal.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,185 +1,185 @@
-BEGIN:VCALENDAR
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19240928T023000
-RRULE:FREQ=YEARLY;UNTIL=19260926T063000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19250503T020000
-RRULE:FREQ=YEARLY;UNTIL=19260502T070000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19270925T000000
-RRULE:FREQ=YEARLY;UNTIL=19320925T040000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19280429T000000
-RRULE:FREQ=YEARLY;UNTIL=19310426T050000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19330430T000000
-RRULE:FREQ=YEARLY;UNTIL=19400428T050000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19340930T000000
-RRULE:FREQ=YEARLY;UNTIL=19390924T040000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;UNTIL=19480926T060000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19491030T020000
-RRULE:FREQ=YEARLY;UNTIL=19501029T060000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19560930T060000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19571027T020000
-RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-DTSTART:19741027T020000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240928T023000
+RRULE:FREQ=YEARLY;UNTIL=19260926T063000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19250503T020000
+RRULE:FREQ=YEARLY;UNTIL=19260502T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19270925T000000
+RRULE:FREQ=YEARLY;UNTIL=19320925T040000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19280429T000000
+RRULE:FREQ=YEARLY;UNTIL=19310426T050000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19330430T000000
+RRULE:FREQ=YEARLY;UNTIL=19400428T050000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19340930T000000
+RRULE:FREQ=YEARLY;UNTIL=19390924T040000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19480926T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19491030T020000
+RRULE:FREQ=YEARLY;UNTIL=19501029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19560930T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19571027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+DTSTART:19741027T020000
+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
+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/Montserrat.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montserrat.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Montserrat.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Montserrat
+X-LIC-LOCATION:America/Montserrat
+BEGIN:STANDARD
+DTSTART:19110701T000100
+RDATE:19110701T000100
+TZNAME:AST
+TZOFFSETFROM:-040852
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nassau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nassau.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nassau.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+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/New_York.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/New_York.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/New_York.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,148 +1,148 @@
-BEGIN:VCALENDAR
-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
-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
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19200328T020000
-RDATE:19200328T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T020000
-RDATE:19201031T020000
-RDATE:19450930T020000
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19210424T020000
-RRULE:FREQ=YEARLY;UNTIL=19410427T070000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;UNTIL=19410928T060000Z;BYDAY=-1SU;BYMONTH=9
-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:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T070000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;UNTIL=19540926T060000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;UNTIL=19661030T060000Z;BYDAY=-1SU;BYMONTH=10
-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: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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19200328T020000
+RDATE:19200328T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19450930T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19210424T020000
+RRULE:FREQ=YEARLY;UNTIL=19410427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;UNTIL=19410928T060000Z;BYDAY=-1SU;BYMONTH=9
+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:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T060000Z;BYDAY=-1SU;BYMONTH=10
+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: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/Nipigon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nipigon.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nipigon.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,87 +1,87 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19400929T000000
-RDATE:19400929T000000
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19741027T020000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400929T000000
+RDATE:19400929T000000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19741027T020000
+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
+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/Nome.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nome.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Nome.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,131 +1,131 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Nome
-X-LIC-LOCATION:America/Nome
-BEGIN:STANDARD
-DTSTART:19000820T120000
-RDATE:19000820T120000
-TZNAME:NST
-TZOFFSETFROM:-110138
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-TZNAME:NST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:NWT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T130000
-RDATE:19450814T130000
-TZNAME:NPT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:NST
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Nome
+X-LIC-LOCATION:America/Nome
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:NST
+TZOFFSETFROM:-110138
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+TZNAME:NST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T130000
+RDATE:19450814T130000
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Noronha.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,104 +1,104 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Noronha
-X-LIC-LOCATION:America/Noronha
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:FNST
-TZOFFSETFROM:-020940
-TZOFFSETTO:-0200
-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: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
-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
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:19890129T000000
-RDATE:19900211T000000
-RDATE:20000227T000000
-RDATE:20001015T000000
-RDATE:20020217T000000
-TZNAME:FNT
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-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
-TZNAME:FNST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Noronha
+X-LIC-LOCATION:America/Noronha
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:FNST
+TZOFFSETFROM:-020940
+TZOFFSETTO:-0200
+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: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
+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
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:20000227T000000
+RDATE:20001015T000000
+RDATE:20020217T000000
+TZNAME:FNT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+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
+TZNAME:FNST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Beulah.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Beulah.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Beulah.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/Center.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-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
-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=19911027T080000Z;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=19920405T090000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19921025T020000
-RDATE:19921025T020000
-TZNAME:CST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930404T020000
-RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19931031T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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=19911027T080000Z;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=19920405T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19921025T020000
+RDATE:19921025T020000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930404T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19931031T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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/North_Dakota/New_Salem.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/New_Salem.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/North_Dakota/New_Salem.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-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
-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=20021027T080000Z;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=20030406T090000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20031026T020000
-RDATE:20031026T020000
-TZNAME:CST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20040404T020000
-RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20041031T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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=20021027T080000Z;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=20030406T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20031026T020000
+RDATE:20031026T020000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20040404T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20041031T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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/Ojinaga.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ojinaga.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Ojinaga.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,119 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Panama.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19080422T000000
-RDATE:19080422T000000
-TZNAME:EST
-TZOFFSETFROM:-051936
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Panama
+X-LIC-LOCATION:America/Panama
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
+TZOFFSETFROM:-051808
+TZOFFSETTO:-051936
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19080422T000000
+RDATE:19080422T000000
+TZNAME:EST
+TZOFFSETFROM:-051936
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Pangnirtung.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Pangnirtung.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Pangnirtung.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,142 +1,142 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Pangnirtung
-X-LIC-LOCATION:America/Pangnirtung
-BEGIN:STANDARD
-DTSTART:19210101T000000
-RDATE:19210101T000000
-TZNAME:AST
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:AWT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T200000
-RDATE:19450814T200000
-TZNAME:APT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19650425T000000
-RDATE:19650425T000000
-TZNAME:ADDT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RDATE:19651031T020000
-TZNAME:AST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;UNTIL=19941030T050000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;UNTIL=19940403T060000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19950402T020000
-RDATE:19950402T020000
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-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
-DTSTART:19960407T020000
-RRULE:FREQ=YEARLY;UNTIL=19990404T070000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Pangnirtung
+X-LIC-LOCATION:America/Pangnirtung
+BEGIN:STANDARD
+DTSTART:19210101T000000
+RDATE:19210101T000000
+TZNAME:AST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:ADDT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:AST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19941030T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=19940403T060000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19950402T020000
+RDATE:19950402T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+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
+DTSTART:19960407T020000
+RRULE:FREQ=YEARLY;UNTIL=19990404T070000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Paramaribo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19350101T000000
-RDATE:19350101T000000
-TZNAME:PMT
-TZOFFSETFROM:-034052
-TZOFFSETTO:-034036
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19451001T000000
-RDATE:19451001T000000
-TZNAME:NEGT
-TZOFFSETFROM:-034036
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19751120T000000
-RDATE:19751120T000000
-TZNAME:SRT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19841001T000000
-RDATE:19841001T000000
-TZNAME:SRT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Paramaribo
+X-LIC-LOCATION:America/Paramaribo
+BEGIN:STANDARD
+DTSTART:19110101T000000
+RDATE:19110101T000000
+TZNAME:PMT
+TZOFFSETFROM:-034040
+TZOFFSETTO:-034052
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19350101T000000
+RDATE:19350101T000000
+TZNAME:PMT
+TZOFFSETFROM:-034052
+TZOFFSETTO:-034036
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451001T000000
+RDATE:19451001T000000
+TZNAME:NEGT
+TZOFFSETFROM:-034036
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19751120T000000
+RDATE:19751120T000000
+TZNAME:SRT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19841001T000000
+RDATE:19841001T000000
+TZNAME:SRT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Phoenix.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Phoenix.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Phoenix.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,68 +1,68 @@
-BEGIN:VCALENDAR
-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
-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:STANDARD
-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:-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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:STANDARD
+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:-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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port-au-Prince.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:PPMT
-TZOFFSETFROM:-044920
-TZOFFSETTO:-0449
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19170124T120000
-RDATE:19170124T120000
-TZNAME:EST
-TZOFFSETFROM:-0449
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830508T000000
-RDATE:19830508T000000
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19831030T000000
-RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20050403T000000
-RRULE:FREQ=YEARLY;UNTIL=20060402T050000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Port-au-Prince
+X-LIC-LOCATION:America/Port-au-Prince
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:PPMT
+TZOFFSETFROM:-044920
+TZOFFSETTO:-0449
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19170124T120000
+RDATE:19170124T120000
+TZNAME:EST
+TZOFFSETFROM:-0449
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830508T000000
+RDATE:19830508T000000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19831030T000000
+RRULE:FREQ=YEARLY;UNTIL=19871025T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20050403T000000
+RRULE:FREQ=YEARLY;UNTIL=20060402T050000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Port_of_Spain.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Acre.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Acre.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Acre.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,92 +1,92 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Porto_Acre
-X-LIC-LOCATION:America/Porto_Acre
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:ACST
-TZOFFSETFROM:-043112
-TZOFFSETTO:-0500
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
-TZNAME:ACT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
-TZNAME:ACST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19500416T010000
-RDATE:19500416T010000
-RDATE:19530301T000000
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-TZNAME:ACT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-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
-DTSTART:20080624T000000
-RDATE:20080624T000000
-TZNAME:AMT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Porto_Acre
+X-LIC-LOCATION:America/Porto_Acre
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:ACST
+TZOFFSETFROM:-043112
+TZOFFSETTO:-0500
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
+TZNAME:ACST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19500416T010000
+RDATE:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Porto_Velho.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,85 +1,85 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Porto_Velho
-X-LIC-LOCATION:America/Porto_Velho
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:AMST
-TZOFFSETFROM:-041536
-TZOFFSETTO:-0400
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Porto_Velho
+X-LIC-LOCATION:America/Porto_Velho
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-041536
+TZOFFSETTO:-0400
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Puerto_Rico.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19450814T200000
-RDATE:19450814T200000
-TZNAME:APT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-TZNAME:AST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:AST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rainy_River.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rainy_River.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rainy_River.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,87 +1,87 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19741027T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19741027T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+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/Rankin_Inlet.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rankin_Inlet.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rankin_Inlet.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,93 +1,93 @@
-BEGIN:VCALENDAR
-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:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RDATE:19651031T020000
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;UNTIL=19991031T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20020407T020000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19991031T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+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/Recife.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Recife.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Recife.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,104 +1,104 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Recife
-X-LIC-LOCATION:America/Recife
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:BRST
-TZOFFSETFROM:-021936
-TZOFFSETTO:-0300
-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: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
-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:20000227T000000
-RDATE:20001015T000000
-RDATE:20020217T000000
-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:STANDARD
-DTSTART:19900917T000000
-RDATE:19900917T000000
-RDATE:20021001T000000
-TZNAME:BRT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19990930T000000
-RDATE:19990930T000000
-RDATE:20010913T000000
-TZNAME:BRST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Recife
+X-LIC-LOCATION:America/Recife
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-021936
+TZOFFSETTO:-0300
+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: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
+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:20000227T000000
+RDATE:20001015T000000
+RDATE:20020217T000000
+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:STANDARD
+DTSTART:19900917T000000
+RDATE:19900917T000000
+RDATE:20021001T000000
+TZNAME:BRT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990930T000000
+RDATE:19990930T000000
+RDATE:20010913T000000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Regina.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,100 +1,100 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Regina
-X-LIC-LOCATION:America/Regina
-BEGIN:STANDARD
-DTSTART:19050901T000000
-RDATE:19050901T000000
-TZNAME:MST
-TZOFFSETFROM:-065836
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19460414T020000
-RDATE:19590426T020000
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19371010T000000
-RDATE:19381002T000000
-RDATE:19450930T020000
-RDATE:19461013T020000
-RDATE:19591025T020000
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19300504T000000
-RRULE:FREQ=YEARLY;UNTIL=19340506T070000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19301005T000000
-RRULE:FREQ=YEARLY;UNTIL=19341007T060000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19370411T000000
-RRULE:FREQ=YEARLY;UNTIL=19410413T070000Z;BYDAY=2SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19391008T000000
-RRULE:FREQ=YEARLY;UNTIL=19411012T060000Z;BYDAY=2SU;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:DAYLIGHT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;UNTIL=19570428T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Regina
+X-LIC-LOCATION:America/Regina
+BEGIN:STANDARD
+DTSTART:19050901T000000
+RDATE:19050901T000000
+TZNAME:MST
+TZOFFSETFROM:-065836
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19460414T020000
+RDATE:19590426T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19371010T000000
+RDATE:19381002T000000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19591025T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19300504T000000
+RRULE:FREQ=YEARLY;UNTIL=19340506T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19301005T000000
+RRULE:FREQ=YEARLY;UNTIL=19341007T060000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19370411T000000
+RRULE:FREQ=YEARLY;UNTIL=19410413T070000Z;BYDAY=2SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19391008T000000
+RRULE:FREQ=YEARLY;UNTIL=19411012T060000Z;BYDAY=2SU;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:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19570428T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Resolute.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,100 +1,95 @@
-BEGIN:VCALENDAR
-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:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RDATE:19651031T020000
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;UNTIL=19991031T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;UNTIL=20051030T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20020407T020000
-RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=19991031T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+RDATE:20061029T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010401T030000
+RDATE:20010401T030000
+RDATE:20070311T030000
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20051030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020407T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T080000Z;BYDAY=1SU;BYMONTH=4
+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
+BEGIN:DAYLIGHT
+DTSTART:20080309T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rio_Branco.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rio_Branco.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rio_Branco.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,92 +1,92 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Rio_Branco
-X-LIC-LOCATION:America/Rio_Branco
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:ACST
-TZOFFSETFROM:-043112
-TZOFFSETTO:-0500
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
-TZNAME:ACT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
-TZNAME:ACST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19500416T010000
-RDATE:19500416T010000
-RDATE:19530301T000000
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-TZNAME:ACT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-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
-DTSTART:20080624T000000
-RDATE:20080624T000000
-TZNAME:AMT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Rio_Branco
+X-LIC-LOCATION:America/Rio_Branco
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:ACST
+TZOFFSETFROM:-043112
+TZOFFSETTO:-0500
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
+TZNAME:ACST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19500416T010000
+RDATE:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Rosario.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,165 +1,165 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Rosario
-X-LIC-LOCATION:America/Rosario
-BEGIN:STANDARD
-DTSTART:18941031T000000
-RDATE:18941031T000000
-TZNAME:CMT
-TZOFFSETFROM:-041648
-TZOFFSETTO:-041648
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200501T000000
-RDATE:19200501T000000
-TZNAME:ART
-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
-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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19321101T000000
-RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19640301T000000
-RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691005T000000
-RDATE:19691005T000000
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740123T000000
-RDATE:19740123T000000
-RDATE:19881201T000000
-RDATE:19921018T000000
-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=19900304T020000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:ART
-TZOFFSETFROM:-0200
-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: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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Rosario
+X-LIC-LOCATION:America/Rosario
+BEGIN:STANDARD
+DTSTART:18941031T000000
+RDATE:18941031T000000
+TZNAME:CMT
+TZOFFSETFROM:-041648
+TZOFFSETTO:-041648
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200501T000000
+RDATE:19200501T000000
+TZNAME:ART
+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
+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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19321101T000000
+RRULE:FREQ=YEARLY;UNTIL=19391101T040000Z;BYMONTH=11
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19640301T000000
+RRULE:FREQ=YEARLY;UNTIL=19660301T030000Z;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691005T000000
+RDATE:19691005T000000
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740123T000000
+RDATE:19740123T000000
+RDATE:19881201T000000
+RDATE:19921018T000000
+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=19900304T020000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:ART
+TZOFFSETFROM:-0200
+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: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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+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/Santa_Isabel.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santa_Isabel.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santa_Isabel.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,139 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santarem.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,92 +1,92 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Santarem
-X-LIC-LOCATION:America/Santarem
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:AMST
-TZOFFSETFROM:-033848
-TZOFFSETTO:-0400
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-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:20080624T000000
-RDATE:20080624T000000
-TZNAME:BRT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Santarem
+X-LIC-LOCATION:America/Santarem
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-033848
+TZOFFSETTO:-0400
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+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: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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santiago.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,201 +1,211 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Santiago
-X-LIC-LOCATION:America/Santiago
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:SMT
-TZOFFSETFROM:-044246
-TZOFFSETTO:-044246
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19100101T000000
-RDATE:19100101T000000
-TZNAME:CLT
-TZOFFSETFROM:-044246
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19160701T000000
-RDATE:19160701T000000
-TZNAME:SMT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-044246
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180901T000000
-RDATE:19180901T000000
-TZNAME:CLT
-TZOFFSETFROM:-044246
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19190701T000000
-RDATE:19190701T000000
-TZNAME:SMT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-044246
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19270901T000000
-RDATE:19270901T000000
-TZNAME:CLST
-TZOFFSETFROM:-044246
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19280401T000000
-RRULE:FREQ=YEARLY;UNTIL=19320401T040000Z;BYMONTH=4
-TZNAME:CLT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460715T000000
-RDATE:19460715T000000
-TZNAME:CLST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19470331T230000
-RDATE:19470331T230000
-TZNAME:CLT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19470522T000000
-RDATE:19470522T000000
-TZNAME:CLST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19681103T000000
-RDATE:19681103T000000
-RDATE:19691123T000000
-RDATE:19730930T000000
-RDATE:19881002T000000
-RDATE:19891015T000000
-RDATE:19900916T000000
-RDATE:19980927T000000
-TZNAME:CLST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19690330T000000
-RDATE:19690330T000000
-RDATE:19700329T000000
-RDATE:19710314T000000
-RDATE:19870412T000000
-RDATE:19900318T000000
-RDATE:19970330T000000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Santiago
+X-LIC-LOCATION:America/Santiago
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:SMT
+TZOFFSETFROM:-044246
+TZOFFSETTO:-044246
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19100101T000000
+RDATE:19100101T000000
+TZNAME:CLT
+TZOFFSETFROM:-044246
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19160701T000000
+RDATE:19160701T000000
+TZNAME:SMT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-044246
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180901T000000
+RDATE:19180901T000000
+TZNAME:CLT
+TZOFFSETFROM:-044246
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19190701T000000
+RDATE:19190701T000000
+TZNAME:SMT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-044246
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19270901T000000
+RDATE:19270901T000000
+TZNAME:CLST
+TZOFFSETFROM:-044246
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19280401T000000
+RRULE:FREQ=YEARLY;UNTIL=19320401T040000Z;BYMONTH=4
+TZNAME:CLT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460715T000000
+RDATE:19460715T000000
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470331T230000
+RDATE:19470331T230000
+TZNAME:CLT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19470522T000000
+RDATE:19470522T000000
+TZNAME:CLST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19681103T000000
+RDATE:19681103T000000
+RDATE:19691123T000000
+RDATE:19730930T000000
+RDATE:19881002T000000
+RDATE:19891015T000000
+RDATE:19900916T000000
+RDATE:19980927T000000
+RDATE:20110821T000000
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19690330T000000
+RDATE:19690330T000000
+RDATE:19700329T000000
+RDATE:19710314T000000
+RDATE:19870412T000000
+RDATE:19900318T000000
+RDATE:19970330T000000
+RDATE:19980315T000000
+RDATE:19990404T000000
+RDATE:20080330T000000
+RDATE:20090315T000000
+RDATE:20100404T000000
+RDATE:20110508T000000
+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;UNTIL=20101010T040000Z;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:20120311T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20121014T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santo_Domingo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santo_Domingo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Santo_Domingo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,68 +1,68 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Santo_Domingo
-X-LIC-LOCATION:America/Santo_Domingo
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:SDMT
-TZOFFSETFROM:-043936
-TZOFFSETTO:-0440
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19330401T120000
-RDATE:19330401T120000
-TZNAME:EST
-TZOFFSETFROM:-0440
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19661030T000000
-RDATE:19661030T000000
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-DTSTART:19700221T000000
-RDATE:19700221T000000
-RDATE:19710120T000000
-TZNAME:EST
-TZOFFSETFROM:-0430
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Santo_Domingo
+X-LIC-LOCATION:America/Santo_Domingo
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:SDMT
+TZOFFSETFROM:-043936
+TZOFFSETTO:-0440
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330401T120000
+RDATE:19330401T120000
+TZNAME:EST
+TZOFFSETFROM:-0440
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19661030T000000
+RDATE:19661030T000000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+DTSTART:19700221T000000
+RDATE:19700221T000000
+RDATE:19710120T000000
+TZNAME:EST
+TZOFFSETFROM:-0430
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Sao_Paulo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,175 +1,175 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Sao_Paulo
-X-LIC-LOCATION:America/Sao_Paulo
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:BRST
-TZOFFSETFROM:-030628
-TZOFFSETTO:-0300
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-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
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19631023T000000
-RDATE:19631023T000000
-TZNAME:BRST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19640101T000000
-RDATE:19640101T000000
-TZNAME:BRST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0200
-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=20060219T020000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20080217T000000
-RRULE:FREQ=YEARLY;UNTIL=20110220T020000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
-TZNAME:BRST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20130217T000000
-RRULE:FREQ=YEARLY;UNTIL=20140216T020000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20160221T000000
-RRULE:FREQ=YEARLY;UNTIL=20170219T020000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Sao_Paulo
+X-LIC-LOCATION:America/Sao_Paulo
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-030628
+TZOFFSETTO:-0300
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+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
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19631023T000000
+RDATE:19631023T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:BRST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0200
+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=20060219T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;UNTIL=20110220T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;UNTIL=20140216T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;UNTIL=20170219T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Scoresbysund.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Scoresbysund
-X-LIC-LOCATION:America/Scoresbysund
-BEGIN:STANDARD
-DTSTART:19160728T000000
-RDATE:19160728T000000
-TZNAME:CGT
-TZOFFSETFROM:-012752
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19800406T020000
-RDATE:19800406T020000
-TZNAME:CGST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19800928T030000
-RDATE:19800928T030000
-TZNAME:CGT
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-END:STANDARD
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Scoresbysund
+X-LIC-LOCATION:America/Scoresbysund
+BEGIN:STANDARD
+DTSTART:19160728T000000
+RDATE:19160728T000000
+TZNAME:CGT
+TZOFFSETFROM:-012752
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800406T020000
+RDATE:19800406T020000
+TZNAME:CGST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19800928T030000
+RDATE:19800928T030000
+TZNAME:CGT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Shiprock.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,134 +1,134 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T020000
-RDATE:19201031T020000
-RDATE:19210522T020000
-RDATE:19450930T020000
-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:DAYLIGHT
-DTSTART:19650425T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19210522T020000
+RDATE:19450930T020000
+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:DAYLIGHT
+DTSTART:19650425T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
+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

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Sitka.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Sitka.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Sitka.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -0,0 +1,124 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Sitka
+X-LIC-LOCATION:America/Sitka
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:PST
+TZOFFSETFROM:-090113
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19690101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+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:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+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
+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
+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/St_Barthelemy.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Barthelemy.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Barthelemy.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/St_Barthelemy
+X-LIC-LOCATION:America/St_Barthelemy
+BEGIN:STANDARD
+DTSTART:19110608T000000
+RDATE:19110608T000000
+TZNAME:AST
+TZOFFSETFROM:-040608
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Johns.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Johns.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Johns.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,189 +1,210 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170408T020000
-RDATE:19170408T020000
-RDATE:19180414T020000
-RDATE:19190505T230000
-TZNAME:NDT
-TZOFFSETFROM:-033052
-TZOFFSETTO:-023052
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170917T020000
-RDATE:19170917T020000
-RDATE:19181031T020000
-RDATE:19190812T230000
-TZNAME:NST
-TZOFFSETFROM:-023052
-TZOFFSETTO:-033052
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19200502T230000
-RRULE:FREQ=YEARLY;UNTIL=19340507T023052Z;BYDAY=1SU;BYMONTH=5
-TZNAME:NDT
-TZOFFSETFROM:-033052
-TZOFFSETTO:-023052
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T230000
-RRULE:FREQ=YEARLY;UNTIL=19341029T013052Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19351027T230000
-RDATE:19351027T230000
-RDATE:19450930T020000
-RDATE:19871025T000100
-TZNAME:NST
-TZOFFSETFROM:-0230
-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
-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
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19450814T203000
-RDATE:19450814T203000
-TZNAME:NPT
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0230
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-TZNAME:NST
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T053000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:NDT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19590927T043000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19601030T020000
-RRULE:FREQ=YEARLY;UNTIL=19861026T043000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19880403T000100
-RDATE:19880403T000100
-TZNAME:NDDT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0130
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19881030T000100
-RDATE:19881030T000100
-TZNAME:NST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19891029T000100
-RRULE:FREQ=YEARLY;UNTIL=20061029T023100Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20070311T000100
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:NDT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T000100
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170408T020000
+RDATE:19170408T020000
+RDATE:19180414T020000
+RDATE:19190505T230000
+TZNAME:NDT
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170917T020000
+RDATE:19170917T020000
+RDATE:19181031T020000
+RDATE:19190812T230000
+TZNAME:NST
+TZOFFSETFROM:-023052
+TZOFFSETTO:-033052
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19200502T230000
+RRULE:FREQ=YEARLY;UNTIL=19340507T023052Z;BYDAY=1SU;BYMONTH=5
+TZNAME:NDT
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T230000
+RRULE:FREQ=YEARLY;UNTIL=19341029T013052Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19351027T230000
+RDATE:19351027T230000
+RDATE:19450930T020000
+RDATE:19871025T000100
+TZNAME:NST
+TZOFFSETFROM:-0230
+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
+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
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19450814T203000
+RDATE:19450814T203000
+TZNAME:NPT
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:NST
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T053000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T043000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19601030T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T043000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19880403T000100
+RDATE:19880403T000100
+TZNAME:NDDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0130
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19881030T000100
+RDATE:19881030T000100
+TZNAME:NST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19891029T000100
+RRULE:FREQ=YEARLY;UNTIL=20061029T023100Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;UNTIL=20110313T033100Z;BYDAY=2SU;BYMONTH=3
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;UNTIL=20101107T023100Z;BYDAY=1SU;BYMONTH=11
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111101T000000
+RDATE:20111101T000000
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0230
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111106T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20120311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Kitts.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Kitts.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Kitts.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/St_Kitts
+X-LIC-LOCATION:America/St_Kitts
+BEGIN:STANDARD
+DTSTART:19120302T000000
+RDATE:19120302T000000
+TZNAME:AST
+TZOFFSETFROM:-041052
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Lucia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Lucia.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Lucia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120101T000000
-RDATE:19120101T000000
-TZNAME:AST
-TZOFFSETFROM:-0404
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/St_Lucia
+X-LIC-LOCATION:America/St_Lucia
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
+TZOFFSETFROM:-0404
+TZOFFSETTO:-0404
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:AST
+TZOFFSETFROM:-0404
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Thomas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Thomas.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Thomas.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/St_Thomas
+X-LIC-LOCATION:America/St_Thomas
+BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:AST
+TZOFFSETFROM:-041944
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Vincent.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Vincent.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/St_Vincent.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120101T000000
-RDATE:19120101T000000
-TZNAME:AST
-TZOFFSETFROM:-040456
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/St_Vincent
+X-LIC-LOCATION:America/St_Vincent
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KMT
+TZOFFSETFROM:-040456
+TZOFFSETTO:-040456
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:AST
+TZOFFSETFROM:-040456
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Swift_Current.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Swift_Current.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Swift_Current.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,98 +1,98 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Swift_Current
-X-LIC-LOCATION:America/Swift_Current
-BEGIN:STANDARD
-DTSTART:19050901T000000
-RDATE:19050901T000000
-TZNAME:MST
-TZOFFSETFROM:-071120
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19570428T020000
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T170000
-RDATE:19450814T170000
-TZNAME:MPT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19500101T000000
-RDATE:19500101T000000
-TZNAME:MST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19590426T020000
-RRULE:FREQ=YEARLY;UNTIL=19610430T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Swift_Current
+X-LIC-LOCATION:America/Swift_Current
+BEGIN:STANDARD
+DTSTART:19050901T000000
+RDATE:19050901T000000
+TZNAME:MST
+TZOFFSETFROM:-071120
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19570428T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T170000
+RDATE:19450814T170000
+TZNAME:MPT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19590426T020000
+RRULE:FREQ=YEARLY;UNTIL=19610430T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tegucigalpa.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19870927T000000
-RRULE:FREQ=YEARLY;UNTIL=19880925T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20060507T000000
-RDATE:20060507T000000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20060807T000000
-RDATE:20060807T000000
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19870927T000000
+RRULE:FREQ=YEARLY;UNTIL=19880925T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20060507T000000
+RDATE:20060507T000000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20060807T000000
+RDATE:20060807T000000
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thule.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thule.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thule.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910929T020000
-RRULE:FREQ=YEARLY;UNTIL=19920927T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930404T020000
-RRULE:FREQ=YEARLY;UNTIL=20060402T060000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19931031T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T050000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910929T020000
+RRULE:FREQ=YEARLY;UNTIL=19920927T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930404T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T060000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19931031T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thunder_Bay.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thunder_Bay.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Thunder_Bay.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,103 +1,103 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Thunder_Bay
-X-LIC-LOCATION:America/Thunder_Bay
-BEGIN:STANDARD
-DTSTART:18950101T000000
-RDATE:18950101T000000
-TZNAME:CST
-TZOFFSETFROM:-0557
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19100101T000000
-RDATE:19100101T000000
-TZNAME:EST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19700101T000000
-RDATE:19730101T000000
-RDATE:19740101T000000
-TZNAME:EST
-TZOFFSETFROM:-0500
-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:19700426T020000
-RRULE:FREQ=YEARLY;UNTIL=19720430T070000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;UNTIL=19721029T060000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-DTSTART:19741027T020000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Thunder_Bay
+X-LIC-LOCATION:America/Thunder_Bay
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:CST
+TZOFFSETFROM:-0557
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19100101T000000
+RDATE:19100101T000000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19700101T000000
+RDATE:19730101T000000
+RDATE:19740101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+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:19700426T020000
+RRULE:FREQ=YEARLY;UNTIL=19720430T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19701025T020000
+RRULE:FREQ=YEARLY;UNTIL=19721029T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+DTSTART:19741027T020000
+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
+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/Tijuana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tijuana.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tijuana.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,154 +1,154 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Tijuana
-X-LIC-LOCATION:America/Tijuana
-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;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;UNTIL=20090405T100000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-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
-DTSTART:20100314T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20101107T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Tijuana
+X-LIC-LOCATION:America/Tijuana
+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;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;UNTIL=20090405T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+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
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20101107T020000
+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/Toronto.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Toronto.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Toronto.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,185 +1,185 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19220917T020000
-RRULE:FREQ=YEARLY;UNTIL=19260919T060000Z;BYDAY=3SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19240504T020000
-RRULE:FREQ=YEARLY;UNTIL=19270501T070000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19270925T020000
-RRULE:FREQ=YEARLY;UNTIL=19320925T060000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19470928T000000
-RRULE:FREQ=YEARLY;UNTIL=19480926T040000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19500430T020000
-RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19560930T060000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19571027T020000
-RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-DTSTART:19741027T020000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19220917T020000
+RRULE:FREQ=YEARLY;UNTIL=19260919T060000Z;BYDAY=3SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19240504T020000
+RRULE:FREQ=YEARLY;UNTIL=19270501T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19270925T020000
+RRULE:FREQ=YEARLY;UNTIL=19320925T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470928T000000
+RRULE:FREQ=YEARLY;UNTIL=19480926T040000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19500430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19560930T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19571027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+DTSTART:19741027T020000
+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
+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/Tortola.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tortola.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Tortola.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Tortola
+X-LIC-LOCATION:America/Tortola
+BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:AST
+TZOFFSETFROM:-041828
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Vancouver.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Vancouver.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Vancouver.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,102 +1,102 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
-RDATE:19461013T020000
-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:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;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
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;UNTIL=19861026T090000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19870101T000000
-RDATE:19870101T000000
-TZNAME:PST
-TZOFFSETFROM:-0800
-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:STANDARD
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+RDATE:19461013T020000
+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:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;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
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870101T000000
+RDATE:19870101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+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:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+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/Virgin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Virgin.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Virgin.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Virgin
+X-LIC-LOCATION:America/Virgin
+BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:AST
+TZOFFSETFROM:-041944
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/America/Whitehorse.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Whitehorse.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Whitehorse.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,110 +1,110 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Whitehorse
-X-LIC-LOCATION:America/Whitehorse
-BEGIN:STANDARD
-DTSTART:19000820T000000
-RDATE:19000820T000000
-TZNAME:YST
-TZOFFSETFROM:-090012
-TZOFFSETTO:-0900
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19190525T020000
-TZNAME:YDT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T150000
-RDATE:19450814T150000
-TZNAME:YPT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19650425T000000
-RDATE:19650425T000000
-TZNAME:YDDT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RDATE:19651031T020000
-TZNAME:YST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19660701T020000
-RDATE:19660701T020000
-TZNAME:PST
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Whitehorse
+X-LIC-LOCATION:America/Whitehorse
+BEGIN:STANDARD
+DTSTART:19000820T000000
+RDATE:19000820T000000
+TZNAME:YST
+TZOFFSETFROM:-090012
+TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19190525T020000
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T150000
+RDATE:19450814T150000
+TZNAME:YPT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:YDDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:YST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660701T020000
+RDATE:19660701T020000
+TZNAME:PST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Winnipeg.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,129 +1,129 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;UNTIL=19600424T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19660424T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19661030T030000
-RRULE:FREQ=YEARLY;UNTIL=20051030T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;UNTIL=20050403T080000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20060101T000000
-RDATE:20060101T000000
-TZNAME:CST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19600424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19660424T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19661030T030000
+RRULE:FREQ=YEARLY;UNTIL=20051030T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20050403T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20060101T000000
+RDATE:20060101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+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/Yakutat.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yakutat.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yakutat.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,117 +1,117 @@
-BEGIN:VCALENDAR
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19690427T020000
-RRULE:FREQ=YEARLY;UNTIL=19730429T110000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:YDT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19691026T020000
-RRULE:FREQ=YEARLY;UNTIL=19831030T100000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:YST
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0900
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19740106T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-TZNAME:YDT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;UNTIL=19830424T110000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:YDT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-END:DAYLIGHT
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19690427T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T110000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T020000
+RRULE:FREQ=YEARLY;UNTIL=19831030T100000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:YST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19830424T110000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+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
+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/Yellowknife.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yellowknife.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/America/Yellowknife.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,93 +1,93 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Yellowknife
-X-LIC-LOCATION:America/Yellowknife
-BEGIN:STANDARD
-DTSTART:19350101T000000
-RDATE:19350101T000000
-TZNAME:MST
-TZOFFSETFROM:+0000
-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:19650425T000000
-RDATE:19650425T000000
-TZNAME:MDDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RDATE:19651031T020000
-TZNAME:MST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800101T000000
-RDATE:19800101T000000
-TZNAME:MST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19800427T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19801026T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:America/Yellowknife
+X-LIC-LOCATION:America/Yellowknife
+BEGIN:STANDARD
+DTSTART:19350101T000000
+RDATE:19350101T000000
+TZNAME:MST
+TZOFFSETFROM:+0000
+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:19650425T000000
+RDATE:19650425T000000
+TZNAME:MDDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:MST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800427T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19801026T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+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/Antarctica/Casey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Casey.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Casey.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-TZOFFSETFROM:+1100
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Davis.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,38 +1,38 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Antarctica/Davis
-X-LIC-LOCATION:Antarctica/Davis
-BEGIN:STANDARD
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Antarctica/Davis
+X-LIC-LOCATION:Antarctica/Davis
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/DumontDUrville.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19520114T000000
-RDATE:19520114T000000
-TZNAME:zzz
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19561101T000000
-RDATE:19561101T000000
-TZNAME:DDUT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Antarctica/DumontDUrville
+X-LIC-LOCATION:Antarctica/DumontDUrville
+BEGIN:STANDARD
+DTSTART:19470101T000000
+RDATE:19470101T000000
+TZNAME:PMT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19520114T000000
+RDATE:19520114T000000
+TZNAME:zzz
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19561101T000000
+RDATE:19561101T000000
+TZNAME:DDUT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Macquarie.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Macquarie.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Macquarie.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,153 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Mawson.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/McMurdo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,73 +1,73 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19750223T030000
-RDATE:19750223T030000
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19760307T030000
-RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-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
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19750223T030000
+RDATE:19750223T030000
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19760307T030000
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+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
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Palmer.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Palmer.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Palmer.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,154 +1,154 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19651015T000000
-RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
-TZNAME:ARST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19670402T000000
-RDATE:19670402T000000
-TZNAME:ART
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19671001T000000
-RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:ARST
-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
-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:-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19821010T000000
-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: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
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-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:DAYLIGHT
-DTSTART:19881002T000000
-RDATE:19881002T000000
-RDATE:19891015T000000
-RDATE:19900916T000000
-RDATE:19980927T000000
-TZNAME:CLST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-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;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=3
-TZNAME:CLT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19651015T000000
+RRULE:FREQ=YEARLY;UNTIL=19661015T040000Z;BYMONTH=10
+TZNAME:ARST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19670402T000000
+RDATE:19670402T000000
+TZNAME:ART
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19671001T000000
+RRULE:FREQ=YEARLY;UNTIL=19681006T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:ARST
+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
+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:-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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19821010T000000
+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: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
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+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:DAYLIGHT
+DTSTART:19881002T000000
+RDATE:19881002T000000
+RDATE:19891015T000000
+RDATE:19900916T000000
+RDATE:19980927T000000
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+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;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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Rothera.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Antarctica/Rothera
+X-LIC-LOCATION:Antarctica/Rothera
+BEGIN:STANDARD
+DTSTART:19761201T000000
+RDATE:19761201T000000
+TZNAME:ROTT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/South_Pole.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/South_Pole.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/South_Pole.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,73 +1,73 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19750223T030000
-RDATE:19750223T030000
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19760307T030000
-RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-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
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19750223T030000
+RDATE:19750223T030000
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19760307T030000
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+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
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Syowa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Syowa.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Syowa.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Antarctica/Syowa
+X-LIC-LOCATION:Antarctica/Syowa
+BEGIN:STANDARD
+DTSTART:19570129T000000
+RDATE:19570129T000000
+TZNAME:SYOT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Vostok.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Vostok.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Antarctica/Vostok.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Antarctica/Vostok
+X-LIC-LOCATION:Antarctica/Vostok
+BEGIN:STANDARD
+DTSTART:19571216T000000
+RDATE:19571216T000000
+TZNAME:VOST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Arctic/Longyearbyen.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Arctic/Longyearbyen.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Arctic/Longyearbyen.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,88 +1,88 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19160930T000000
-RDATE:19160930T000000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451001T030000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19590920T030000
-RRULE:FREQ=YEARLY;UNTIL=19650919T010000Z;BYDAY=3SU;BYMONTH=9
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19160930T000000
+RDATE:19160930T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19590920T030000
+RRULE:FREQ=YEARLY;UNTIL=19650919T010000Z;BYDAY=3SU;BYMONTH=9
+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
+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/Asia/Aden.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aden.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aden.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Aden
+X-LIC-LOCATION:Asia/Aden
+BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:AST
+TZOFFSETFROM:+030048
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Almaty.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Almaty.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Almaty.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +1,101 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
-TZNAME:ALMT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:ALMT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T200000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:ALMST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910101T000000
-RDATE:19910101T000000
-RDATE:20050315T000000
-TZNAME:ALMT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:ALMT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;UNTIL=20040327T200000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:ALMST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;UNTIL=19950923T200000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:ALMT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;UNTIL=20041030T200000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:ALMT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
+TZNAME:ALMT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ALMT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ALMST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+RDATE:20050315T000000
+TZNAME:ALMT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:ALMT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20040327T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ALMST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ALMT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20041030T200000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:ALMT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Amman.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Amman.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Amman.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Amman
-X-LIC-LOCATION:Asia/Amman
-BEGIN:STANDARD
-DTSTART:19310101T000000
-RDATE:19310101T000000
-TZNAME:EEST
-TZOFFSETFROM:+022344
-TZOFFSETTO:+0200
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19761101T000000
-RDATE:19761101T000000
-RDATE:19771001T000000
-RDATE:19780930T000000
-RDATE:19851001T000000
-RDATE:19910927T000000
-RDATE:19940916T000000
-RDATE:20031024T010000
-RDATE:20041015T010000
-RDATE:20050930T010000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19860404T000000
-RRULE:FREQ=YEARLY;UNTIL=19880331T220000Z;BYDAY=1FR;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19861003T000000
-RRULE:FREQ=YEARLY;UNTIL=19901004T210000Z;BYDAY=1FR;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19921002T000000
-RRULE:FREQ=YEARLY;UNTIL=19930930T210000Z;BYDAY=1FR;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930402T000000
-RRULE:FREQ=YEARLY;UNTIL=19980402T220000Z;BYDAY=1FR;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19950915T010000
-RRULE:FREQ=YEARLY;UNTIL=19980917T220000Z;BYDAY=3FR;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19990924T010000
-RRULE:FREQ=YEARLY;UNTIL=20020926T220000Z;BYDAY=-1FR;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20061027T010000
-RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Amman
+X-LIC-LOCATION:Asia/Amman
+BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:EEST
+TZOFFSETFROM:+022344
+TZOFFSETTO:+0200
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19761101T000000
+RDATE:19761101T000000
+RDATE:19771001T000000
+RDATE:19780930T000000
+RDATE:19851001T000000
+RDATE:19910927T000000
+RDATE:19940916T000000
+RDATE:20031024T010000
+RDATE:20041015T010000
+RDATE:20050930T010000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19860404T000000
+RRULE:FREQ=YEARLY;UNTIL=19880331T220000Z;BYDAY=1FR;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19861003T000000
+RRULE:FREQ=YEARLY;UNTIL=19901004T210000Z;BYDAY=1FR;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19921002T000000
+RRULE:FREQ=YEARLY;UNTIL=19930930T210000Z;BYDAY=1FR;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930402T000000
+RRULE:FREQ=YEARLY;UNTIL=19980402T220000Z;BYDAY=1FR;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19950915T010000
+RRULE:FREQ=YEARLY;UNTIL=19980917T220000Z;BYDAY=3FR;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990924T010000
+RRULE:FREQ=YEARLY;UNTIL=20020926T220000Z;BYDAY=-1FR;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+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
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20061027T010000
+RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Anadyr.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Anadyr.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Anadyr.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,143 +1,137 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Anadyr
-X-LIC-LOCATION:Asia/Anadyr
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:ANAT
-TZOFFSETFROM:+114956
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300621T000000
-RDATE:19300621T000000
-TZNAME:ANAST
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810401T000000
-RDATE:19810401T000000
-TZNAME:ANAST
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T120000Z;BYMONTH=4
-TZNAME:ANAST
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-RDATE:20100328T020000
-TZNAME:ANAST
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:ANAT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920119T020000
-RDATE:19920119T020000
-TZNAME:ANAST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920328T230000
-RDATE:19920328T230000
-TZNAME:ANAST
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:ANAT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;UNTIL=20090328T140000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:ANAST
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;UNTIL=19950923T140000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:ANAT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;UNTIL=20091024T140000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:ANAT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20101031T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:ANAT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20110327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:ANAST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Anadyr
+X-LIC-LOCATION:Asia/Anadyr
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:ANAT
+TZOFFSETFROM:+114956
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:ANAST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RDATE:19810401T000000
+TZNAME:ANAST
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T120000Z;BYMONTH=4
+TZNAME:ANAST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+RDATE:20100328T020000
+TZNAME:ANAST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+RDATE:20101031T030000
+TZNAME:ANAT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:ANAST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:ANAST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:ANAT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20090328T140000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ANAST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T140000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ANAT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20091024T140000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:ANAT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:ANAT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtau.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtau.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,137 +1,137 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Aqtau
-X-LIC-LOCATION:Asia/Aqtau
-BEGIN:STANDARD
-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
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RDATE:19811001T000000
-TZNAME:SHET
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820401T000000
-RDATE:19820401T000000
-TZNAME:SHEST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
-TZNAME:SHET
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
-TZNAME:SHEST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:SHET
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-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:+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
-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
-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
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T020000
-RRULE:FREQ=YEARLY;UNTIL=20040327T220000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:AQTST
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20050315T000000
-RDATE:20050315T000000
-TZNAME:AQTT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Aqtau
+X-LIC-LOCATION:Asia/Aqtau
+BEGIN:STANDARD
+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
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RDATE:19811001T000000
+TZNAME:SHET
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820401T000000
+RDATE:19820401T000000
+TZNAME:SHEST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:SHET
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:SHEST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:SHET
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+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:+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
+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
+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
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T020000
+RRULE:FREQ=YEARLY;UNTIL=20040327T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:AQTST
+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
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Aqtobe.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,128 +1,128 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Aqtobe
-X-LIC-LOCATION:Asia/Aqtobe
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:AKTT
-TZOFFSETFROM:+034840
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300621T000000
-RDATE:19300621T000000
-TZNAME:AKTT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19810401T000000
-RDATE:19810401T000000
-TZNAME:AKTST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RDATE:19811001T000000
-TZNAME:AKTT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820401T000000
-RDATE:19820401T000000
-TZNAME:AKTST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
-TZNAME:AKTT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
-TZNAME:AKTST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AKTT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:AKTST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910101T000000
-RDATE:19910101T000000
-TZNAME:AKTT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-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
-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
-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
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20050315T000000
-RDATE:20050315T000000
-TZNAME:AQTT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Aqtobe
+X-LIC-LOCATION:Asia/Aqtobe
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:AKTT
+TZOFFSETFROM:+034840
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:AKTT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810401T000000
+RDATE:19810401T000000
+TZNAME:AKTST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RDATE:19811001T000000
+TZNAME:AKTT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820401T000000
+RDATE:19820401T000000
+TZNAME:AKTST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:AKTT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:AKTST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AKTT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:AKTST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+TZNAME:AKTT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ashgabat.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,79 +1,79 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Ashgabat
-X-LIC-LOCATION:Asia/Ashgabat
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:ASHT
-TZOFFSETFROM:+035332
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300621T000000
-RDATE:19300621T000000
-TZNAME:ASHST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
-TZNAME:ASHST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
-TZNAME:ASHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:ASHT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:ASHST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-TZNAME:ASHST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:ASHT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19911027T000000
-RDATE:19911027T000000
-TZNAME:TMST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920119T020000
-RDATE:19920119T020000
-TZNAME:TMT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Ashgabat
+X-LIC-LOCATION:Asia/Ashgabat
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:ASHT
+TZOFFSETFROM:+035332
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:ASHST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:ASHST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:ASHT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:ASHT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:ASHST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:ASHST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:ASHT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19911027T000000
+RDATE:19911027T000000
+TZNAME:TMST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:TMT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baghdad.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baghdad.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baghdad.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,73 +1,73 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Baghdad
-X-LIC-LOCATION:Asia/Baghdad
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:BMT
-TZOFFSETFROM:+025740
-TZOFFSETTO:+025736
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180101T000000
-RDATE:19180101T000000
-TZNAME:AST
-TZOFFSETFROM:+025736
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19820501T000000
-RDATE:19820501T000000
-RDATE:19830331T000000
-TZNAME:ADT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19840930T200000Z;BYMONTH=10
-TZNAME:AST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19840401T000000
-RRULE:FREQ=YEARLY;UNTIL=19850331T210000Z;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19850929T020000
-RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Baghdad
+X-LIC-LOCATION:Asia/Baghdad
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:BMT
+TZOFFSETFROM:+025740
+TZOFFSETTO:+025736
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+TZNAME:AST
+TZOFFSETFROM:+025736
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19820501T000000
+RDATE:19820501T000000
+RDATE:19830331T000000
+TZNAME:ADT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19840930T200000Z;BYMONTH=10
+TZNAME:AST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840401T000000
+RRULE:FREQ=YEARLY;UNTIL=19850331T210000Z;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19850929T020000
+RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bahrain.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19720601T000000
-RDATE:19720601T000000
-TZNAME:AST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Bahrain
+X-LIC-LOCATION:Asia/Bahrain
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:GST
+TZOFFSETFROM:+032220
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19720601T000000
+RDATE:19720601T000000
+TZNAME:AST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baku.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baku.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Baku.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,116 +1,116 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Baku
-X-LIC-LOCATION:Asia/Baku
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:BAKT
-TZOFFSETFROM:+031924
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19570301T000000
-RDATE:19570301T000000
-TZNAME:BAKST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
-TZNAME:BAKST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
-TZNAME:BAKT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:BAKT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-TZNAME:BAKST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910830T000000
-RDATE:19910830T000000
-RDATE:19960101T000000
-RDATE:19970101T000000
-TZNAME:AZST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:AZT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920328T230000
-RDATE:19920328T230000
-TZNAME:AZST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:AZT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Baku
+X-LIC-LOCATION:Asia/Baku
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:BAKT
+TZOFFSETFROM:+031924
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570301T000000
+RDATE:19570301T000000
+TZNAME:BAKST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
+TZNAME:BAKST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:BAKT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:BAKT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+TZNAME:BAKST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910830T000000
+RDATE:19910830T000000
+RDATE:19960101T000000
+RDATE:19970101T000000
+TZNAME:AZST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:AZT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:AZST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:AZT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bangkok.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200401T000000
-RDATE:19200401T000000
-TZNAME:ICT
-TZOFFSETFROM:+064204
-TZOFFSETTO:+0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Bangkok
+X-LIC-LOCATION:Asia/Bangkok
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:BMT
+TZOFFSETFROM:+064204
+TZOFFSETTO:+064204
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200401T000000
+RDATE:19200401T000000
+TZNAME:ICT
+TZOFFSETFROM:+064204
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Beirut.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Beirut.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Beirut.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,112 +1,112 @@
-BEGIN:VCALENDAR
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19571001T000000
-RRULE:FREQ=YEARLY;UNTIL=19610930T210000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19721001T000000
-RRULE:FREQ=YEARLY;UNTIL=19770930T210000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19730501T000000
-RRULE:FREQ=YEARLY;UNTIL=19770430T220000Z;BYMONTH=5
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19840501T000000
-RRULE:FREQ=YEARLY;UNTIL=19870430T220000Z;BYMONTH=5
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19841016T000000
-RRULE:FREQ=YEARLY;UNTIL=19911015T210000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19900501T000000
-RRULE:FREQ=YEARLY;UNTIL=19920430T220000Z;BYMONTH=5
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19930328T000000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19930926T000000
-RRULE:FREQ=YEARLY;UNTIL=19980926T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19991031T000000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19571001T000000
+RRULE:FREQ=YEARLY;UNTIL=19610930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19721001T000000
+RRULE:FREQ=YEARLY;UNTIL=19770930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19730501T000000
+RRULE:FREQ=YEARLY;UNTIL=19770430T220000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19840501T000000
+RRULE:FREQ=YEARLY;UNTIL=19870430T220000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19841016T000000
+RRULE:FREQ=YEARLY;UNTIL=19911015T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19900501T000000
+RRULE:FREQ=YEARLY;UNTIL=19920430T220000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19930328T000000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T000000
+RRULE:FREQ=YEARLY;UNTIL=19980926T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991031T000000
+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/Bishkek.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bishkek.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Bishkek.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +1,101 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
-TZNAME:FRUT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:FRUT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-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
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910831T020000
-RDATE:19910831T020000
-TZNAME:KGST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920927T000000
-RRULE:FREQ=YEARLY;UNTIL=19960928T180000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:KGT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19970330T023000
-RRULE:FREQ=YEARLY;UNTIL=20050326T213000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:KGST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19971026T023000
-RRULE:FREQ=YEARLY;UNTIL=20041030T203000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:KGT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20050812T000000
-RDATE:20050812T000000
-TZNAME:KGT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
+TZNAME:FRUT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:FRUT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+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
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910831T020000
+RDATE:19910831T020000
+TZNAME:KGST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920927T000000
+RRULE:FREQ=YEARLY;UNTIL=19960928T180000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KGT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T023000
+RRULE:FREQ=YEARLY;UNTIL=20050326T213000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:KGST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19971026T023000
+RRULE:FREQ=YEARLY;UNTIL=20041030T203000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:KGT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20050812T000000
+RDATE:20050812T000000
+TZNAME:KGT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Brunei.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Brunei.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Brunei.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19330101T000000
-RDATE:19330101T000000
-TZNAME:BNT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Brunei
+X-LIC-LOCATION:Asia/Brunei
+BEGIN:STANDARD
+DTSTART:19260301T000000
+RDATE:19260301T000000
+TZNAME:BNT
+TZOFFSETFROM:+073940
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+TZNAME:BNT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Calcutta.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Calcutta.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Calcutta.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,38 +1,38 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19411001T000000
-RDATE:19411001T000000
-TZNAME:BURT
-TZOFFSETFROM:+055320
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420515T000000
-RDATE:19420515T000000
-RDATE:19451015T000000
-TZNAME:IST
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0530
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420901T000000
-RDATE:19420901T000000
-TZNAME:IST
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0630
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Calcutta
+X-LIC-LOCATION:Asia/Calcutta
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:HMT
+TZOFFSETFROM:+055328
+TZOFFSETTO:+055320
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19411001T000000
+RDATE:19411001T000000
+TZNAME:BURT
+TZOFFSETFROM:+055320
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420515T000000
+RDATE:19420515T000000
+RDATE:19451015T000000
+TZNAME:IST
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:IST
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Choibalsan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Choibalsan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Choibalsan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,86 +1,86 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19840401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T150000Z;BYMONTH=4
-TZNAME:CHOST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840930T000000
-RRULE:FREQ=YEARLY;UNTIL=19980926T140000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CHOT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T000000
-RRULE:FREQ=YEARLY;UNTIL=19980328T150000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:CHOST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20010428T020000
-RDATE:20010428T020000
-TZNAME:CHOST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010929T020000
-RRULE:FREQ=YEARLY;UNTIL=20060929T160000Z;BYDAY=-1SA;BYMONTH=9
-TZNAME:CHOT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20020330T020000
-RRULE:FREQ=YEARLY;UNTIL=20060324T170000Z;BYDAY=-1SA;BYMONTH=3
-TZNAME:CHOST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080331T000000
-RDATE:20080331T000000
-TZNAME:CHOST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T150000Z;BYMONTH=4
+TZNAME:CHOST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840930T000000
+RRULE:FREQ=YEARLY;UNTIL=19980926T140000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CHOT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T000000
+RRULE:FREQ=YEARLY;UNTIL=19980328T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CHOST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20010428T020000
+RDATE:20010428T020000
+TZNAME:CHOST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;UNTIL=20060929T160000Z;BYDAY=-1SA;BYMONTH=9
+TZNAME:CHOT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;UNTIL=20060324T170000Z;BYDAY=-1SA;BYMONTH=3
+TZNAME:CHOST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080331T000000
+RDATE:20080331T000000
+TZNAME:CHOST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chongqing.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chongqing.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chongqing.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,45 +1,45 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Chongqing
-X-LIC-LOCATION:Asia/Chongqing
-BEGIN:STANDARD
-DTSTART:19280101T000000
-RDATE:19280101T000000
-TZNAME:LONT
-TZOFFSETFROM:+070620
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800501T000000
-RDATE:19800501T000000
-TZNAME:CST
-TZOFFSETFROM:+0700
-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
-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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Chongqing
+X-LIC-LOCATION:Asia/Chongqing
+BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:LONT
+TZOFFSETFROM:+070620
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800501T000000
+RDATE:19800501T000000
+TZNAME:CST
+TZOFFSETFROM:+0700
+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
+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
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chungking.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chungking.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Chungking.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,45 +1,45 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Chungking
-X-LIC-LOCATION:Asia/Chungking
-BEGIN:STANDARD
-DTSTART:19280101T000000
-RDATE:19280101T000000
-TZNAME:LONT
-TZOFFSETFROM:+070620
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800501T000000
-RDATE:19800501T000000
-TZNAME:CST
-TZOFFSETFROM:+0700
-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
-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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Chungking
+X-LIC-LOCATION:Asia/Chungking
+BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:LONT
+TZOFFSETFROM:+070620
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800501T000000
+RDATE:19800501T000000
+TZNAME:CST
+TZOFFSETFROM:+0700
+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
+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
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Colombo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Colombo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Colombo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,65 +1,65 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19060101T000000
-RDATE:19060101T000000
-TZNAME:IST
-TZOFFSETFROM:+051932
-TZOFFSETTO:+0530
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420105T000000
-RDATE:19420105T000000
-TZNAME:IHST
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420901T000000
-RDATE:19420901T000000
-TZNAME:IST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19451016T020000
-RDATE:19451016T020000
-TZNAME:IST
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0530
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960525T000000
-RDATE:19960525T000000
-TZNAME:LKT
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961026T003000
-RDATE:19961026T003000
-TZNAME:LKT
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20060415T003000
-RDATE:20060415T003000
-TZNAME:IST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0530
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Colombo
+X-LIC-LOCATION:Asia/Colombo
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
+TZOFFSETFROM:+051924
+TZOFFSETTO:+051932
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19060101T000000
+RDATE:19060101T000000
+TZNAME:IST
+TZOFFSETFROM:+051932
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420105T000000
+RDATE:19420105T000000
+TZNAME:IHST
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:IST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451016T020000
+RDATE:19451016T020000
+TZNAME:IST
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960525T000000
+RDATE:19960525T000000
+TZNAME:LKT
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961026T003000
+RDATE:19961026T003000
+TZNAME:LKT
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20060415T003000
+RDATE:20060415T003000
+TZNAME:IST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0530
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dacca.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dacca.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dacca.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19411001T000000
-RDATE:19411001T000000
-TZNAME:BURT
-TZOFFSETFROM:+055320
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420515T000000
-RDATE:19420515T000000
-TZNAME:IST
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0530
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420901T000000
-RDATE:19420901T000000
-TZNAME:BURT
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19510930T000000
-RDATE:19510930T000000
-TZNAME:DACT
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0600
-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
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Dacca
+X-LIC-LOCATION:Asia/Dacca
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:HMT
+TZOFFSETFROM:+060140
+TZOFFSETTO:+055320
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19411001T000000
+RDATE:19411001T000000
+TZNAME:BURT
+TZOFFSETFROM:+055320
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420515T000000
+RDATE:19420515T000000
+TZNAME:IST
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:BURT
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510930T000000
+RDATE:19510930T000000
+TZNAME:DACT
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0600
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Damascus.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,164 +1,164 @@
-BEGIN:VCALENDAR
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19630501T020000
-RRULE:FREQ=YEARLY;UNTIL=19650501T000000Z;BYMONTH=5
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19661001T020000
-RRULE:FREQ=YEARLY;UNTIL=19760930T230000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19670501T020000
-RRULE:FREQ=YEARLY;UNTIL=19780501T000000Z;BYMONTH=5
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19770901T020000
-RRULE:FREQ=YEARLY;UNTIL=19780831T230000Z;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830409T020000
-RRULE:FREQ=YEARLY;UNTIL=19840409T000000Z;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19831001T020000
-RRULE:FREQ=YEARLY;UNTIL=19840930T230000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19871031T020000
-RRULE:FREQ=YEARLY;UNTIL=19881030T230000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19911001T000000
-RRULE:FREQ=YEARLY;UNTIL=19920930T210000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19940401T000000
-RRULE:FREQ=YEARLY;UNTIL=19960331T220000Z;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19941001T000000
-RRULE:FREQ=YEARLY;UNTIL=20050930T210000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19970331T000000
-RRULE:FREQ=YEARLY;UNTIL=19980329T220000Z;BYDAY=-1MO;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19990401T000000
-RRULE:FREQ=YEARLY;UNTIL=20060331T220000Z;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20091030T000000
-RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20100402T000000
-RRULE:FREQ=YEARLY;BYDAY=1FR;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19630501T020000
+RRULE:FREQ=YEARLY;UNTIL=19650501T000000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19661001T020000
+RRULE:FREQ=YEARLY;UNTIL=19760930T230000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670501T020000
+RRULE:FREQ=YEARLY;UNTIL=19780501T000000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19770901T020000
+RRULE:FREQ=YEARLY;UNTIL=19780831T230000Z;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830409T020000
+RRULE:FREQ=YEARLY;UNTIL=19840409T000000Z;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19831001T020000
+RRULE:FREQ=YEARLY;UNTIL=19840930T230000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19871031T020000
+RRULE:FREQ=YEARLY;UNTIL=19881030T230000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19911001T000000
+RRULE:FREQ=YEARLY;UNTIL=19920930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19940401T000000
+RRULE:FREQ=YEARLY;UNTIL=19960331T220000Z;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19941001T000000
+RRULE:FREQ=YEARLY;UNTIL=20050930T210000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970331T000000
+RRULE:FREQ=YEARLY;UNTIL=19980329T220000Z;BYDAY=-1MO;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19990401T000000
+RRULE:FREQ=YEARLY;UNTIL=20060331T220000Z;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20091030T000000
+RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20100402T000000
+RRULE:FREQ=YEARLY;BYDAY=1FR;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dhaka.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dhaka.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dhaka.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19411001T000000
-RDATE:19411001T000000
-TZNAME:BURT
-TZOFFSETFROM:+055320
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420515T000000
-RDATE:19420515T000000
-TZNAME:IST
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0530
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420901T000000
-RDATE:19420901T000000
-TZNAME:BURT
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19510930T000000
-RDATE:19510930T000000
-TZNAME:DACT
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0600
-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
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Dhaka
+X-LIC-LOCATION:Asia/Dhaka
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:HMT
+TZOFFSETFROM:+060140
+TZOFFSETTO:+055320
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19411001T000000
+RDATE:19411001T000000
+TZNAME:BURT
+TZOFFSETFROM:+055320
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420515T000000
+RDATE:19420515T000000
+TZNAME:IST
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:BURT
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510930T000000
+RDATE:19510930T000000
+TZNAME:DACT
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0600
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dili.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420221T230000
-RDATE:19420221T230000
-TZNAME:JST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450923T000000
-RDATE:19450923T000000
-TZNAME:TLT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19760503T000000
-RDATE:19760503T000000
-TZNAME:CIT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20000917T000000
-RDATE:20000917T000000
-TZNAME:TLT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Dili
+X-LIC-LOCATION:Asia/Dili
+BEGIN:STANDARD
+DTSTART:19120101T000000
+RDATE:19120101T000000
+TZNAME:TLT
+TZOFFSETFROM:+082220
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420221T230000
+RDATE:19420221T230000
+TZNAME:JST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:TLT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19760503T000000
+RDATE:19760503T000000
+TZNAME:CIT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000917T000000
+RDATE:20000917T000000
+TZNAME:TLT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dubai.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dubai.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Dubai.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Dubai
+X-LIC-LOCATION:Asia/Dubai
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:GST
+TZOFFSETFROM:+034112
+TZOFFSETTO:+0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Gaza.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Gaza.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Gaza.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,184 +1,172 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Gaza
-X-LIC-LOCATION:Asia/Gaza
-BEGIN:STANDARD
-DTSTART:19001001T000000
-RDATE:19001001T000000
-TZNAME:EET
-TZOFFSETFROM:+021752
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19451101T020000
-RDATE:19451101T020000
-RDATE:19461101T000000
-RDATE:19661001T030000
-RDATE:20041001T010000
-RDATE:20051004T020000
-RDATE:20060922T000000
-RDATE:20070913T020000
-RDATE:20080829T020000
-RDATE:20090904T020000
-RDATE:20100811T000000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19480515T000000
-RDATE:19480515T000000
-RDATE:19960101T000000
-RDATE:19990101T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-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
-RDATE:19750831T000000
-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
-DTSTART:19740707T000000
-RDATE:19740707T000000
-RDATE:19750420T000000
-RDATE:19850414T000000
-RDATE:19860518T000000
-RDATE:19870415T000000
-RDATE:19880409T000000
-RDATE:19890430T000000
-RDATE:19900325T000000
-RDATE:19910324T000000
-RDATE:19920329T000000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Gaza
+X-LIC-LOCATION:Asia/Gaza
+BEGIN:STANDARD
+DTSTART:19001001T000000
+RDATE:19001001T000000
+TZNAME:EET
+TZOFFSETFROM:+021752
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451101T020000
+RDATE:19451101T020000
+RDATE:19461101T000000
+RDATE:19661001T030000
+RDATE:20041001T010000
+RDATE:20051004T020000
+RDATE:20060922T000000
+RDATE:20070913T020000
+RDATE:20080829T000000
+RDATE:20090904T020000
+RDATE:20100811T000000
+RDATE:20110801T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19480515T000000
+RDATE:19480515T000000
+RDATE:19960101T000000
+RDATE:19990101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19570510T000000
+RDATE:19570510T000000
+RDATE:19580501T000000
+RDATE:20090327T000000
+RDATE:20100327T000100
+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
+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
+RDATE:19750831T000000
+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
+DTSTART:19740707T000000
+RDATE:19740707T000000
+RDATE:19750420T000000
+RDATE:19850414T000000
+RDATE:19860518T000000
+RDATE:19870415T000000
+RDATE:19880409T000000
+RDATE:19890430T000000
+RDATE:19900325T000000
+RDATE:19910324T000000
+RDATE:19920329T000000
+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:STANDARD
+DTSTART:20110402T120100
+RDATE:20110402T120100
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Harbin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Harbin.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Harbin.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,60 +1,60 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Harbin
-X-LIC-LOCATION:Asia/Harbin
-BEGIN:STANDARD
-DTSTART:19280101T000000
-RDATE:19280101T000000
-TZNAME:CHAT
-TZOFFSETFROM:+082644
-TZOFFSETTO:+0830
-END:STANDARD
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19660501T000000
-RDATE:19660501T000000
-TZNAME:CHAT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0830
-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
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Harbin
+X-LIC-LOCATION:Asia/Harbin
+BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:CHAT
+TZOFFSETFROM:+082644
+TZOFFSETTO:+0830
+END:STANDARD
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660501T000000
+RDATE:19660501T000000
+TZNAME:CHAT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0830
+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
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Added: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hebron.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hebron.ics	                        (rev 0)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hebron.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -0,0 +1,187 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Hebron
+X-LIC-LOCATION:Asia/Hebron
+BEGIN:STANDARD
+DTSTART:19001001T000000
+RDATE:19001001T000000
+TZNAME:EET
+TZOFFSETFROM:+022023
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451101T020000
+RDATE:19451101T020000
+RDATE:19461101T000000
+RDATE:19661001T030000
+RDATE:20041001T010000
+RDATE:20051004T020000
+RDATE:20060922T000000
+RDATE:20070913T020000
+RDATE:20090904T020000
+RDATE:20100811T000000
+RDATE:20110801T000000
+RDATE:20111003T030000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19480515T000000
+RDATE:19480515T000000
+RDATE:19960101T000000
+RDATE:19990101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19570510T000000
+RDATE:19570510T000000
+RDATE:19580501T000000
+RDATE:20090327T000000
+RDATE:20100327T000100
+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
+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
+RDATE:19750831T000000
+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
+DTSTART:19740707T000000
+RDATE:19740707T000000
+RDATE:19750420T000000
+RDATE:19850414T000000
+RDATE:19860518T000000
+RDATE:19870415T000000
+RDATE:19880409T000000
+RDATE:19890430T000000
+RDATE:19900325T000000
+RDATE:19910324T000000
+RDATE:19920329T000000
+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:STANDARD
+DTSTART:20080801T000000
+RDATE:20080801T000000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080901T000000
+RDATE:20080901T000000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110401T120100
+RDATE:20110401T120100
+RDATE:20110830T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ho_Chi_Minh.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ho_Chi_Minh.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ho_Chi_Minh.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110311T000100
-RDATE:19110311T000100
-TZNAME:ICT
-TZOFFSETFROM:+070620
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120501T000000
-RDATE:19120501T000000
-TZNAME:ICT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19310501T000000
-RDATE:19310501T000000
-TZNAME:ICT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:ICT
+TZOFFSETFROM:+070620
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120501T000000
+RDATE:19120501T000000
+TZNAME:ICT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310501T000000
+RDATE:19310501T000000
+TZNAME:ICT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hong_Kong.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hong_Kong.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hong_Kong.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,114 +1,114 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Hong_Kong
-X-LIC-LOCATION:Asia/Hong_Kong
-BEGIN:STANDARD
-DTSTART:19041030T000000
-RDATE:19041030T000000
-TZNAME:HKST
-TZOFFSETFROM:+073636
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19410401T033000
-RDATE:19410401T033000
-RDATE:19460420T033000
-RDATE:19470413T033000
-RDATE:19480502T033000
-RDATE:19731230T033000
-RDATE:19790513T033000
-TZNAME:HKST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19411225T000000
-RDATE:19411225T000000
-TZNAME:JST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450915T000000
-RDATE:19450915T000000
-TZNAME:HKST
-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
-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
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Hong_Kong
+X-LIC-LOCATION:Asia/Hong_Kong
+BEGIN:STANDARD
+DTSTART:19041030T000000
+RDATE:19041030T000000
+TZNAME:HKST
+TZOFFSETFROM:+073636
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19410401T033000
+RDATE:19410401T033000
+RDATE:19460420T033000
+RDATE:19470413T033000
+RDATE:19480502T033000
+RDATE:19731230T033000
+RDATE:19790513T033000
+TZNAME:HKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19411225T000000
+RDATE:19411225T000000
+TZNAME:JST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450915T000000
+RDATE:19450915T000000
+TZNAME:HKST
+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
+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
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Hovd.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20010428T020000
-RDATE:20010428T020000
-TZNAME:HOVST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010929T020000
-RRULE:FREQ=YEARLY;UNTIL=20060929T180000Z;BYDAY=-1SA;BYMONTH=9
-TZNAME:HOVT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20020330T020000
-RRULE:FREQ=YEARLY;UNTIL=20060324T190000Z;BYDAY=-1SA;BYMONTH=3
-TZNAME:HOVST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20010428T020000
+RDATE:20010428T020000
+TZNAME:HOVST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;UNTIL=20060929T180000Z;BYDAY=-1SA;BYMONTH=9
+TZNAME:HOVT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;UNTIL=20060324T190000Z;BYDAY=-1SA;BYMONTH=3
+TZNAME:HOVST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Irkutsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Irkutsk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Irkutsk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,108 +1,115 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T150000Z;BYMONTH=10
-TZNAME:IRKT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T180000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:IRKT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T180000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:IRKST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-TZNAME:IRKST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:IRKT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920328T230000
-RDATE:19920328T230000
-TZNAME:IRKST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:IRKT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:IRKST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-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
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T150000Z;BYMONTH=10
+TZNAME:IRKT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T180000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:IRKT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T180000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:IRKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:IRKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:IRKT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:IRKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:IRKT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20100327T180000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:IRKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+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;UNTIL=20101030T180000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:IRKT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:IRKT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Istanbul.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Istanbul.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Istanbul.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,236 +1,264 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Istanbul
-X-LIC-LOCATION:Asia/Istanbul
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:IMT
-TZOFFSETFROM:+015552
-TZOFFSETTO:+015656
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19101001T000000
-RDATE:19101001T000000
-TZNAME:EEST
-TZOFFSETFROM:+015656
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160501T000000
-RDATE:19160501T000000
-RDATE:19200328T000000
-RDATE:19210403T000000
-RDATE:19220326T000000
-RDATE:19240513T000000
-RDATE:19250501T000000
-RDATE:19400630T000000
-RDATE:19401201T000000
-RDATE:19420401T000000
-RDATE:19450402T000000
-RDATE:19460601T000000
-RDATE:19490410T000000
-RDATE:19500419T000000
-RDATE:19510422T000000
-RDATE:19620715T000000
-RDATE:19640515T000000
-RDATE:19730603T010000
-RDATE:19740331T020000
-RDATE:19750330T000000
-RDATE:19760601T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T000000
-RDATE:19161001T000000
-RDATE:19201025T000000
-RDATE:19211003T000000
-RDATE:19221008T000000
-RDATE:19401005T000000
-RDATE:19410921T000000
-RDATE:19421101T000000
-RDATE:19451008T000000
-RDATE:19461001T000000
-RDATE:19511008T000000
-RDATE:19621008T000000
-RDATE:19641001T000000
-RDATE:19731104T030000
-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:+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
-TZNAME:TRST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19790401T030000
-RDATE:19790401T030000
-TZNAME:TRST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19791015T000000
-RRULE:FREQ=YEARLY;UNTIL=19821010T200000Z;BYDAY=-3MO;BYMONTH=10
-TZNAME:TRT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-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: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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Istanbul
+X-LIC-LOCATION:Asia/Istanbul
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:IMT
+TZOFFSETFROM:+015552
+TZOFFSETTO:+015656
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19101001T000000
+RDATE:19101001T000000
+TZNAME:EEST
+TZOFFSETFROM:+015656
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160501T000000
+RDATE:19160501T000000
+RDATE:19200328T000000
+RDATE:19210403T000000
+RDATE:19220326T000000
+RDATE:19240513T000000
+RDATE:19250501T000000
+RDATE:19400630T000000
+RDATE:19401201T000000
+RDATE:19420401T000000
+RDATE:19450402T000000
+RDATE:19460601T000000
+RDATE:19490410T000000
+RDATE:19500419T000000
+RDATE:19510422T000000
+RDATE:19620715T000000
+RDATE:19640515T000000
+RDATE:19730603T010000
+RDATE:19740331T020000
+RDATE:19750330T000000
+RDATE:19760601T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T000000
+RDATE:19161001T000000
+RDATE:19201025T000000
+RDATE:19211003T000000
+RDATE:19221008T000000
+RDATE:19401005T000000
+RDATE:19410921T000000
+RDATE:19421101T000000
+RDATE:19451008T000000
+RDATE:19461001T000000
+RDATE:19511008T000000
+RDATE:19621008T000000
+RDATE:19641001T000000
+RDATE:19731104T030000
+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:+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
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19790401T030000
+RDATE:19790401T030000
+TZNAME:TRST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19791015T000000
+RRULE:FREQ=YEARLY;UNTIL=19821010T200000Z;BYDAY=-3MO;BYMONTH=10
+TZNAME:TRT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+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: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
+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;UNTIL=20100328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071028T040000
+RRULE:FREQ=YEARLY;UNTIL=20101031T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T030000
+RDATE:20110327T030000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110328T030000
+RDATE:20110328T030000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111030T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20120325T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jakarta.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jakarta.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jakarta.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,65 +1,65 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19231231T234712
-RDATE:19231231T234712
-TZNAME:JAVT
-TZOFFSETFROM:+070712
-TZOFFSETTO:+0720
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19321101T000000
-RDATE:19321101T000000
-TZNAME:WIT
-TZOFFSETFROM:+0720
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420323T000000
-RDATE:19420323T000000
-TZNAME:JST
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450923T000000
-RDATE:19450923T000000
-TZNAME:WIT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19480501T000000
-RDATE:19480501T000000
-TZNAME:WIT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19500501T000000
-RDATE:19500501T000000
-TZNAME:WIT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19640101T000000
-RDATE:19640101T000000
-TZNAME:WIT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Jakarta
+X-LIC-LOCATION:Asia/Jakarta
+BEGIN:STANDARD
+DTSTART:18670810T000000
+RDATE:18670810T000000
+TZNAME:JMT
+TZOFFSETFROM:+070712
+TZOFFSETTO:+070712
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19231231T234712
+RDATE:19231231T234712
+TZNAME:JAVT
+TZOFFSETFROM:+070712
+TZOFFSETTO:+0720
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:WIT
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420323T000000
+RDATE:19420323T000000
+TZNAME:JST
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:WIT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19480501T000000
+RDATE:19480501T000000
+TZNAME:WIT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19500501T000000
+RDATE:19500501T000000
+TZNAME:WIT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:WIT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jayapura.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jayapura.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jayapura.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19440901T000000
-RDATE:19440901T000000
-TZNAME:CST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19640101T000000
-RDATE:19640101T000000
-TZNAME:EIT
-TZOFFSETFROM:+0930
-TZOFFSETTO:+0900
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Jayapura
+X-LIC-LOCATION:Asia/Jayapura
+BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:EIT
+TZOFFSETFROM:+092248
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19440901T000000
+RDATE:19440901T000000
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:EIT
+TZOFFSETFROM:+0930
+TZOFFSETTO:+0900
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jerusalem.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jerusalem.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Jerusalem.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,164 +1,164 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Jerusalem
-X-LIC-LOCATION:Asia/Jerusalem
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:JMT
-TZOFFSETFROM:+022056
-TZOFFSETTO:+022040
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180101T000000
-RDATE:19180101T000000
-TZNAME:IST
-TZOFFSETFROM:+022040
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400601T000000
-RDATE:19400601T000000
-RDATE:19430401T020000
-RDATE:19440401T000000
-RDATE:19450416T000000
-RDATE:19460416T020000
-RDATE:19490501T000000
-RDATE:19500416T000000
-RDATE:19510401T000000
-RDATE:19520420T020000
-RDATE:19530412T020000
-RDATE:19540613T000000
-RDATE:19550611T020000
-RDATE:19560603T000000
-RDATE:19570429T020000
-RDATE:19740707T000000
-RDATE:19750420T000000
-RDATE:19850414T000000
-RDATE:19860518T000000
-RDATE:19870415T000000
-RDATE:19880409T000000
-RDATE:19890430T000000
-RDATE:19900325T000000
-RDATE:19910324T000000
-RDATE:19920329T000000
-RDATE:19930402T000000
-RDATE:19940401T000000
-RDATE:19950331T000000
-RDATE:19960315T000000
-RDATE:19970321T000000
-RDATE:19980320T000000
-RDATE:19990402T020000
-RDATE:20000414T020000
-RDATE:20010409T010000
-RDATE:20020329T010000
-RDATE:20030328T010000
-RDATE:20040407T010000
-RDATE:20050401T020000
-RDATE:20110401T020000
-RDATE:20160401T020000
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19451101T020000
-RDATE:19451101T020000
-RDATE:19461101T000000
-RDATE:19500915T030000
-RDATE:19511111T030000
-RDATE:19521019T030000
-RDATE:19530913T030000
-RDATE:19540912T000000
-RDATE:19550911T000000
-RDATE:19560930T030000
-RDATE:19570922T000000
-RDATE:19741013T000000
-RDATE:19750831T000000
-RDATE:19850915T000000
-RDATE:19860907T000000
-RDATE:19870913T000000
-RDATE:19880903T000000
-RDATE:19890903T000000
-RDATE:19900826T000000
-RDATE:19910901T000000
-RDATE:19920906T000000
-RDATE:19930905T000000
-RDATE:19940828T000000
-RDATE:19950903T000000
-RDATE:19960916T000000
-RDATE:19970914T000000
-RDATE:19980906T000000
-RDATE:19990903T020000
-RDATE:20001006T010000
-RDATE:20010924T010000
-RDATE:20021007T010000
-RDATE:20031003T010000
-RDATE:20040922T010000
-RDATE:20051009T020000
-RDATE:20061001T020000
-RDATE:20070916T020000
-RDATE:20081005T020000
-RDATE:20090927T020000
-RDATE:20100912T020000
-RDATE:20111002T020000
-RDATE:20120923T020000
-RDATE:20130908T020000
-RDATE:20140928T020000
-RDATE:20150920T020000
-RDATE:20161009T020000
-RDATE:20170924T020000
-TZNAME:IST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Jerusalem
+X-LIC-LOCATION:Asia/Jerusalem
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:JMT
+TZOFFSETFROM:+022056
+TZOFFSETTO:+022040
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+TZNAME:IST
+TZOFFSETFROM:+022040
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400601T000000
+RDATE:19400601T000000
+RDATE:19430401T020000
+RDATE:19440401T000000
+RDATE:19450416T000000
+RDATE:19460416T020000
+RDATE:19490501T000000
+RDATE:19500416T000000
+RDATE:19510401T000000
+RDATE:19520420T020000
+RDATE:19530412T020000
+RDATE:19540613T000000
+RDATE:19550611T020000
+RDATE:19560603T000000
+RDATE:19570429T020000
+RDATE:19740707T000000
+RDATE:19750420T000000
+RDATE:19850414T000000
+RDATE:19860518T000000
+RDATE:19870415T000000
+RDATE:19880409T000000
+RDATE:19890430T000000
+RDATE:19900325T000000
+RDATE:19910324T000000
+RDATE:19920329T000000
+RDATE:19930402T000000
+RDATE:19940401T000000
+RDATE:19950331T000000
+RDATE:19960315T000000
+RDATE:19970321T000000
+RDATE:19980320T000000
+RDATE:19990402T020000
+RDATE:20000414T020000
+RDATE:20010409T010000
+RDATE:20020329T010000
+RDATE:20030328T010000
+RDATE:20040407T010000
+RDATE:20050401T020000
+RDATE:20110401T020000
+RDATE:20160401T020000
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451101T020000
+RDATE:19451101T020000
+RDATE:19461101T000000
+RDATE:19500915T030000
+RDATE:19511111T030000
+RDATE:19521019T030000
+RDATE:19530913T030000
+RDATE:19540912T000000
+RDATE:19550911T000000
+RDATE:19560930T030000
+RDATE:19570922T000000
+RDATE:19741013T000000
+RDATE:19750831T000000
+RDATE:19850915T000000
+RDATE:19860907T000000
+RDATE:19870913T000000
+RDATE:19880903T000000
+RDATE:19890903T000000
+RDATE:19900826T000000
+RDATE:19910901T000000
+RDATE:19920906T000000
+RDATE:19930905T000000
+RDATE:19940828T000000
+RDATE:19950903T000000
+RDATE:19960916T000000
+RDATE:19970914T000000
+RDATE:19980906T000000
+RDATE:19990903T020000
+RDATE:20001006T010000
+RDATE:20010924T010000
+RDATE:20021007T010000
+RDATE:20031003T010000
+RDATE:20040922T010000
+RDATE:20051009T020000
+RDATE:20061001T020000
+RDATE:20070916T020000
+RDATE:20081005T020000
+RDATE:20090927T020000
+RDATE:20100912T020000
+RDATE:20111002T020000
+RDATE:20120923T020000
+RDATE:20130908T020000
+RDATE:20140928T020000
+RDATE:20150920T020000
+RDATE:20161009T020000
+RDATE:20170924T020000
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+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;BYMONTH=3
+TZNAME:IDT
+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;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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kabul.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450101T000000
-RDATE:19450101T000000
-TZNAME:AFT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0430
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Kabul
+X-LIC-LOCATION:Asia/Kabul
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:AFT
+TZOFFSETFROM:+043648
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450101T000000
+RDATE:19450101T000000
+TZNAME:AFT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0430
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kamchatka.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kamchatka.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kamchatka.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,116 +1,110 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T110000Z;BYMONTH=10
-TZNAME:PETT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T140000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:PETT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:PETT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;UNTIL=20091024T140000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:PETT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20101031T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:PETT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20110327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:PETST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T110000Z;BYMONTH=10
+TZNAME:PETT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T140000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:PETT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+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
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+RDATE:20101031T030000
+TZNAME:PETT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:PETST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:PETT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20091024T140000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PETT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:PETT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Karachi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Karachi.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Karachi.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,62 +1,62 @@
-BEGIN:VCALENDAR
-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
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19451015T000000
-RDATE:19451015T000000
-TZNAME:IST
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0530
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19510930T000000
-RDATE:19510930T000000
-TZNAME:KART
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19710326T000000
-RDATE:19710326T000000
-TZNAME:PKST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20020407T000100
-RDATE:20020407T000100
-RDATE:20080601T000000
-RDATE:20090415T000000
-TZNAME:PKST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20021006T000100
-RDATE:20021006T000100
-RDATE:20081101T000000
-RDATE:20091101T000000
-TZNAME:PKT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451015T000000
+RDATE:19451015T000000
+TZNAME:IST
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510930T000000
+RDATE:19510930T000000
+TZNAME:KART
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19710326T000000
+RDATE:19710326T000000
+TZNAME:PKST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020407T000100
+RDATE:20020407T000100
+RDATE:20080601T000000
+RDATE:20090415T000000
+TZNAME:PKST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kashgar.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,52 +1,52 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Kashgar
-X-LIC-LOCATION:Asia/Kashgar
-BEGIN:STANDARD
-DTSTART:19280101T000000
-RDATE:19280101T000000
-TZNAME:KAST
-TZOFFSETFROM:+050356
-TZOFFSETTO:+0530
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19400101T000000
-RDATE:19400101T000000
-TZNAME:KAST
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0500
-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
-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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Kashgar
+X-LIC-LOCATION:Asia/Kashgar
+BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:KAST
+TZOFFSETFROM:+050356
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400101T000000
+RDATE:19400101T000000
+TZNAME:KAST
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0500
+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
+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
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kathmandu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kathmandu.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kathmandu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Katmandu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19860101T000000
-RDATE:19860101T000000
-TZNAME:NPT
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0545
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Katmandu
+X-LIC-LOCATION:Asia/Katmandu
+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/Kolkata.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kolkata.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kolkata.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,38 +1,38 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19411001T000000
-RDATE:19411001T000000
-TZNAME:BURT
-TZOFFSETFROM:+055320
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420515T000000
-RDATE:19420515T000000
-RDATE:19451015T000000
-TZNAME:IST
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0530
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420901T000000
-RDATE:19420901T000000
-TZNAME:IST
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0630
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Kolkata
+X-LIC-LOCATION:Asia/Kolkata
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:HMT
+TZOFFSETFROM:+055328
+TZOFFSETTO:+055320
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19411001T000000
+RDATE:19411001T000000
+TZNAME:BURT
+TZOFFSETFROM:+055320
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420515T000000
+RDATE:19420515T000000
+RDATE:19451015T000000
+TZNAME:IST
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:IST
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0630
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Krasnoyarsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Krasnoyarsk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Krasnoyarsk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +1,108 @@
-BEGIN:VCALENDAR
-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
-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;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;BYDAY=-1SU;BYMONTH=10
-TZNAME:KRAT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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=20100327T190000Z;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=20101030T190000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:KRAT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:KRAT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuala_Lumpur.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuala_Lumpur.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuala_Lumpur.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,65 +1,65 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19050601T000000
-RDATE:19050601T000000
-TZNAME:MALT
-TZOFFSETFROM:+065525
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19330101T000000
-RDATE:19330101T000000
-TZNAME:MALST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0720
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19360101T000000
-RDATE:19360101T000000
-TZNAME:MALT
-TZOFFSETFROM:+0720
-TZOFFSETTO:+0720
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410901T000000
-RDATE:19410901T000000
-TZNAME:MALT
-TZOFFSETFROM:+0720
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420216T000000
-RDATE:19420216T000000
-TZNAME:JST
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450912T000000
-RDATE:19450912T000000
-TZNAME:MALT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820101T000000
-RDATE:19820101T000000
-TZNAME:MYT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Kuala_Lumpur
+X-LIC-LOCATION:Asia/Kuala_Lumpur
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:SMT
+TZOFFSETFROM:+064646
+TZOFFSETTO:+065525
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19050601T000000
+RDATE:19050601T000000
+TZNAME:MALT
+TZOFFSETFROM:+065525
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+TZNAME:MALST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0720
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19360101T000000
+RDATE:19360101T000000
+TZNAME:MALT
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0720
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410901T000000
+RDATE:19410901T000000
+TZNAME:MALT
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420216T000000
+RDATE:19420216T000000
+TZNAME:JST
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450912T000000
+RDATE:19450912T000000
+TZNAME:MALT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:MYT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuching.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuching.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuching.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Kuching
-X-LIC-LOCATION:Asia/Kuching
-BEGIN:STANDARD
-DTSTART:19260301T000000
-RDATE:19260301T000000
-TZNAME:BORT
-TZOFFSETFROM:+072120
-TZOFFSETTO:+0730
-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
-TZOFFSETFROM:+0820
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420216T000000
-RDATE:19420216T000000
-TZNAME:JST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450912T000000
-RDATE:19450912T000000
-TZNAME:BORT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820101T000000
-RDATE:19820101T000000
-TZNAME:MYT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Kuching
+X-LIC-LOCATION:Asia/Kuching
+BEGIN:STANDARD
+DTSTART:19260301T000000
+RDATE:19260301T000000
+TZNAME:BORT
+TZOFFSETFROM:+072120
+TZOFFSETTO:+0730
+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
+TZOFFSETFROM:+0820
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420216T000000
+RDATE:19420216T000000
+TZNAME:JST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450912T000000
+RDATE:19450912T000000
+TZNAME:BORT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:MYT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuwait.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuwait.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Kuwait.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Kuwait
+X-LIC-LOCATION:Asia/Kuwait
+BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:AST
+TZOFFSETFROM:+031156
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macao.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macao.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macao.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,112 +1,112 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19611105T033000
-RRULE:FREQ=YEARLY;UNTIL=19641031T183000Z;BYDAY=1SU;BYMONTH=11
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19630317T000000
-RDATE:19630317T000000
-RDATE:19640322T033000
-RDATE:19650321T000000
-TZNAME:MOST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T000000
-RDATE:19651031T000000
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19661016T033000
-RRULE:FREQ=YEARLY;UNTIL=19711016T183000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
- 0,21,22;BYMONTH=10
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19720416T000000
-RRULE:FREQ=YEARLY;UNTIL=19740420T160000Z;BYDAY=3SU;BYMONTH=4
-TZNAME:MOST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19721015T000000
-RRULE:FREQ=YEARLY;UNTIL=19731020T150000Z;BYDAY=3SU;BYMONTH=10
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19741020T033000
-RRULE:FREQ=YEARLY;UNTIL=19771015T183000Z;BYDAY=3SU;BYMONTH=10
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19991220T000000
-RDATE:19991220T000000
-TZNAME:CST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19611105T033000
+RRULE:FREQ=YEARLY;UNTIL=19641031T183000Z;BYDAY=1SU;BYMONTH=11
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19630317T000000
+RDATE:19630317T000000
+RDATE:19640322T033000
+RDATE:19650321T000000
+TZNAME:MOST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T000000
+RDATE:19651031T000000
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19661016T033000
+RRULE:FREQ=YEARLY;UNTIL=19711016T183000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=10
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19720416T000000
+RRULE:FREQ=YEARLY;UNTIL=19740420T160000Z;BYDAY=3SU;BYMONTH=4
+TZNAME:MOST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19721015T000000
+RRULE:FREQ=YEARLY;UNTIL=19731020T150000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19741020T033000
+RRULE:FREQ=YEARLY;UNTIL=19771015T183000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991220T000000
+RDATE:19991220T000000
+TZNAME:CST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macau.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macau.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Macau.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,112 +1,112 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19611105T033000
-RRULE:FREQ=YEARLY;UNTIL=19641031T183000Z;BYDAY=1SU;BYMONTH=11
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19630317T000000
-RDATE:19630317T000000
-RDATE:19640322T033000
-RDATE:19650321T000000
-TZNAME:MOST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T000000
-RDATE:19651031T000000
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19661016T033000
-RRULE:FREQ=YEARLY;UNTIL=19711016T183000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
- 0,21,22;BYMONTH=10
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19720416T000000
-RRULE:FREQ=YEARLY;UNTIL=19740420T160000Z;BYDAY=3SU;BYMONTH=4
-TZNAME:MOST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19721015T000000
-RRULE:FREQ=YEARLY;UNTIL=19731020T150000Z;BYDAY=3SU;BYMONTH=10
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19741020T033000
-RRULE:FREQ=YEARLY;UNTIL=19771015T183000Z;BYDAY=3SU;BYMONTH=10
-TZNAME:MOT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19991220T000000
-RDATE:19991220T000000
-TZNAME:CST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19611105T033000
+RRULE:FREQ=YEARLY;UNTIL=19641031T183000Z;BYDAY=1SU;BYMONTH=11
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19630317T000000
+RDATE:19630317T000000
+RDATE:19640322T033000
+RDATE:19650321T000000
+TZNAME:MOST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T000000
+RDATE:19651031T000000
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19661016T033000
+RRULE:FREQ=YEARLY;UNTIL=19711016T183000Z;BYDAY=SU;BYMONTHDAY=16,17,18,19,2
+ 0,21,22;BYMONTH=10
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19720416T000000
+RRULE:FREQ=YEARLY;UNTIL=19740420T160000Z;BYDAY=3SU;BYMONTH=4
+TZNAME:MOST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19721015T000000
+RRULE:FREQ=YEARLY;UNTIL=19731020T150000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19741020T033000
+RRULE:FREQ=YEARLY;UNTIL=19771015T183000Z;BYDAY=3SU;BYMONTH=10
+TZNAME:MOT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19991220T000000
+RDATE:19991220T000000
+TZNAME:CST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Magadan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Magadan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Magadan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +1,108 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z;BYMONTH=10
-TZNAME:MAGT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T150000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:MAGT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T150000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:MAGST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-TZNAME:MAGST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:MAGT
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920328T230000
-RDATE:19920328T230000
-TZNAME:MAGST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:MAGT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:MAGST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-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
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z;BYMONTH=10
+TZNAME:MAGT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T150000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:MAGT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MAGST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:MAGST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:MAGT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:MAGST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:MAGT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20100327T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:MAGST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+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;UNTIL=20101030T150000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MAGT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:MAGT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Makassar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Makassar.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Makassar.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19321101T000000
-RDATE:19321101T000000
-TZNAME:CIT
-TZOFFSETFROM:+075736
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420209T000000
-RDATE:19420209T000000
-TZNAME:JST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450923T000000
-RDATE:19450923T000000
-TZNAME:CIT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Makassar
+X-LIC-LOCATION:Asia/Makassar
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:MMT
+TZOFFSETFROM:+075736
+TZOFFSETTO:+075736
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:CIT
+TZOFFSETFROM:+075736
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420209T000000
+RDATE:19420209T000000
+TZNAME:JST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:CIT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Manila.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Manila.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Manila.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,48 +1,48 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Manila
-X-LIC-LOCATION:Asia/Manila
-BEGIN:STANDARD
-DTSTART:18990511T000000
-RDATE:18990511T000000
-TZNAME:PHST
-TZOFFSETFROM:+0804
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19361101T000000
-RDATE:19361101T000000
-RDATE:19540412T000000
-RDATE:19780322T000000
-TZNAME:PHST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19370201T000000
-RDATE:19370201T000000
-RDATE:19540701T000000
-RDATE:19780921T000000
-TZNAME:PHT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420501T000000
-RDATE:19420501T000000
-TZNAME:JST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19441101T000000
-RDATE:19441101T000000
-TZNAME:PHST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Manila
+X-LIC-LOCATION:Asia/Manila
+BEGIN:STANDARD
+DTSTART:18990511T000000
+RDATE:18990511T000000
+TZNAME:PHST
+TZOFFSETFROM:+0804
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19361101T000000
+RDATE:19361101T000000
+RDATE:19540412T000000
+RDATE:19780322T000000
+TZNAME:PHST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19370201T000000
+RDATE:19370201T000000
+RDATE:19540701T000000
+RDATE:19780921T000000
+TZNAME:PHT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420501T000000
+RDATE:19420501T000000
+TZNAME:JST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Muscat.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Muscat
+X-LIC-LOCATION:Asia/Muscat
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:GST
+TZOFFSETFROM:+035420
+TZOFFSETTO:+0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Nicosia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Nicosia.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Nicosia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,76 +1,76 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Nicosia
-X-LIC-LOCATION:Asia/Nicosia
-BEGIN:STANDARD
-DTSTART:19211114T000000
-RDATE:19211114T000000
-TZNAME:EEST
-TZOFFSETFROM:+021328
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19750413T000000
-RDATE:19750413T000000
-RDATE:19760515T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19751012T000000
-RDATE:19751012T000000
-RDATE:19761011T000000
-RDATE:19770925T000000
-RDATE:19781002T000000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19770403T000000
-RRULE:FREQ=YEARLY;UNTIL=19800405T220000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T000000
-RRULE:FREQ=YEARLY;UNTIL=19970927T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T000000
-RRULE:FREQ=YEARLY;UNTIL=19980328T220000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990328T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Nicosia
+X-LIC-LOCATION:Asia/Nicosia
+BEGIN:STANDARD
+DTSTART:19211114T000000
+RDATE:19211114T000000
+TZNAME:EEST
+TZOFFSETFROM:+021328
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19750413T000000
+RDATE:19750413T000000
+RDATE:19760515T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19751012T000000
+RDATE:19751012T000000
+RDATE:19761011T000000
+RDATE:19770925T000000
+RDATE:19781002T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T000000
+RRULE:FREQ=YEARLY;UNTIL=19800405T220000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T000000
+RRULE:FREQ=YEARLY;UNTIL=19970927T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T000000
+RRULE:FREQ=YEARLY;UNTIL=19980328T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19990328T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novokuznetsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novokuznetsk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novokuznetsk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+RDATE:20101031T030000
+TZNAME:NOVT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:NOVT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novosibirsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novosibirsk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Novosibirsk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,109 +1,116 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z;BYMONTH=10
-TZNAME:NOVT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T190000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:NOVT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T190000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:NOVST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920328T230000
-RDATE:19920328T230000
-RDATE:19930328T020000
-TZNAME:NOVST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:NOVT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19930523T000000
-RDATE:19930523T000000
-TZNAME:NOVST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;UNTIL=19950923T200000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:NOVT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19940327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:NOVST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:NOVT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T160000Z;BYMONTH=10
+TZNAME:NOVT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T190000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:NOVT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T190000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:NOVST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+RDATE:19930328T020000
+TZNAME:NOVST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:NOVT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19930523T000000
+RDATE:19930523T000000
+TZNAME:NOVST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:NOVT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19940327T020000
+RRULE:FREQ=YEARLY;UNTIL=20100327T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:NOVST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20101030T200000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NOVT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:NOVT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Omsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Omsk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Omsk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +1,108 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
-TZNAME:OMST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:OMST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T200000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:OMSST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-TZNAME:OMSST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:OMST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920328T230000
-RDATE:19920328T230000
-TZNAME:OMSST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:OMST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:OMSST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0700
-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
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T170000Z;BYMONTH=10
+TZNAME:OMST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T200000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:OMST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:OMSST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:OMSST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:OMST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:OMSST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:OMST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20100327T200000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:OMSST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+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;UNTIL=20101030T200000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:OMST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:OMST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Oral.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Oral.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Oral.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,149 +1,149 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Oral
-X-LIC-LOCATION:Asia/Oral
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:URAT
-TZOFFSETFROM:+032524
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300621T000000
-RDATE:19300621T000000
-TZNAME:URAT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19810401T000000
-RDATE:19810401T000000
-TZNAME:URAST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RDATE:19811001T000000
-TZNAME:URAT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820401T000000
-RDATE:19820401T000000
-TZNAME:URAST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
-TZNAME:URAT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
-TZNAME:URAST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19880924T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:URAT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-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
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910101T000000
-RDATE:19910101T000000
-TZNAME:URAT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-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
-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
-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
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20050315T000000
-RDATE:20050315T000000
-TZNAME:ORAT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Oral
+X-LIC-LOCATION:Asia/Oral
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:URAT
+TZOFFSETFROM:+032524
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:URAT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810401T000000
+RDATE:19810401T000000
+TZNAME:URAST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RDATE:19811001T000000
+TZNAME:URAT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820401T000000
+RDATE:19820401T000000
+TZNAME:URAST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:URAT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:URAST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19880924T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:URAT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+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
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+TZNAME:URAT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+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
+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
+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
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20050315T000000
+RDATE:20050315T000000
+TZNAME:ORAT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Phnom_Penh.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Phnom_Penh.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Phnom_Penh.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110311T000100
-RDATE:19110311T000100
-TZNAME:ICT
-TZOFFSETFROM:+070620
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120501T000000
-RDATE:19120501T000000
-TZNAME:ICT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19310501T000000
-RDATE:19310501T000000
-TZNAME:ICT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Phnom_Penh
+X-LIC-LOCATION:Asia/Phnom_Penh
+BEGIN:STANDARD
+DTSTART:19060609T000000
+RDATE:19060609T000000
+TZNAME:SMT
+TZOFFSETFROM:+065940
+TZOFFSETTO:+070620
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:ICT
+TZOFFSETFROM:+070620
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120501T000000
+RDATE:19120501T000000
+TZNAME:ICT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310501T000000
+RDATE:19310501T000000
+TZNAME:ICT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pontianak.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pontianak.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pontianak.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,65 +1,65 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19321101T000000
-RDATE:19321101T000000
-TZNAME:WIT
-TZOFFSETFROM:+071720
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420129T000000
-RDATE:19420129T000000
-TZNAME:JST
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450923T000000
-RDATE:19450923T000000
-TZNAME:WIT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19480501T000000
-RDATE:19480501T000000
-TZNAME:WIT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19500501T000000
-RDATE:19500501T000000
-TZNAME:WIT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19640101T000000
-RDATE:19640101T000000
-TZNAME:CIT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19880101T000000
-RDATE:19880101T000000
-TZNAME:WIT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Pontianak
+X-LIC-LOCATION:Asia/Pontianak
+BEGIN:STANDARD
+DTSTART:19080501T000000
+RDATE:19080501T000000
+TZNAME:PMT
+TZOFFSETFROM:+071720
+TZOFFSETTO:+071720
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:WIT
+TZOFFSETFROM:+071720
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420129T000000
+RDATE:19420129T000000
+TZNAME:JST
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:WIT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19480501T000000
+RDATE:19480501T000000
+TZNAME:WIT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19500501T000000
+RDATE:19500501T000000
+TZNAME:WIT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:CIT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19880101T000000
+RDATE:19880101T000000
+TZNAME:WIT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pyongyang.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pyongyang.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Pyongyang.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,45 +1,45 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19540321T000000
-RDATE:19540321T000000
-TZNAME:KST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19610810T000000
-RDATE:19610810T000000
-TZNAME:KST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Pyongyang
+X-LIC-LOCATION:Asia/Pyongyang
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KST
+TZOFFSETFROM:+0823
+TZOFFSETTO:+0830
+END:STANDARD
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19540321T000000
+RDATE:19540321T000000
+TZNAME:KST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19610810T000000
+RDATE:19610810T000000
+TZNAME:KST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qatar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qatar.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qatar.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19720601T000000
-RDATE:19720601T000000
-TZNAME:AST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Qatar
+X-LIC-LOCATION:Asia/Qatar
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:GST
+TZOFFSETFROM:+032608
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19720601T000000
+RDATE:19720601T000000
+TZNAME:AST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qyzylorda.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qyzylorda.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Qyzylorda.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,135 +1,135 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Qyzylorda
-X-LIC-LOCATION:Asia/Qyzylorda
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:KIZT
-TZOFFSETFROM:+042152
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300621T000000
-RDATE:19300621T000000
-TZNAME:KIZT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19810401T000000
-RDATE:19810401T000000
-TZNAME:KIZST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RDATE:19811001T000000
-TZNAME:KIZT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820401T000000
-RDATE:19820401T000000
-TZNAME:KIZST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
-TZNAME:KIZT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
-TZNAME:KIZST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:KIZT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:KIZST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910101T000000
-RDATE:19910101T000000
-TZNAME:KIZT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19911216T000000
-RDATE:19911216T000000
-TZNAME:QYZT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-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
-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
-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
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20050315T000000
-RDATE:20050315T000000
-TZNAME:QYZT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Qyzylorda
+X-LIC-LOCATION:Asia/Qyzylorda
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:KIZT
+TZOFFSETFROM:+042152
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:KIZT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19810401T000000
+RDATE:19810401T000000
+TZNAME:KIZST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RDATE:19811001T000000
+TZNAME:KIZT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820401T000000
+RDATE:19820401T000000
+TZNAME:KIZST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:KIZT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:KIZST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KIZT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:KIZST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910101T000000
+RDATE:19910101T000000
+TZNAME:KIZT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19911216T000000
+RDATE:19911216T000000
+TZNAME:QYZT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+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
+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
+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
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20050315T000000
+RDATE:20050315T000000
+TZNAME:QYZT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Rangoon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Rangoon.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Rangoon.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200101T000000
-RDATE:19200101T000000
-TZNAME:BURT
-TZOFFSETFROM:+062436
-TZOFFSETTO:+0630
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420501T000000
-RDATE:19420501T000000
-TZNAME:JST
-TZOFFSETFROM:+0630
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450503T000000
-RDATE:19450503T000000
-TZNAME:MMT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0630
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Rangoon
+X-LIC-LOCATION:Asia/Rangoon
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:RMT
+TZOFFSETFROM:+062440
+TZOFFSETTO:+062436
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:BURT
+TZOFFSETFROM:+062436
+TZOFFSETTO:+0630
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420501T000000
+RDATE:19420501T000000
+TZNAME:JST
+TZOFFSETFROM:+0630
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450503T000000
+RDATE:19450503T000000
+TZNAME:MMT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0630
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Riyadh.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Riyadh.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Riyadh.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Riyadh
+X-LIC-LOCATION:Asia/Riyadh
+BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:AST
+TZOFFSETFROM:+030652
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Saigon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Saigon.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Saigon.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110311T000100
-RDATE:19110311T000100
-TZNAME:ICT
-TZOFFSETFROM:+070620
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120501T000000
-RDATE:19120501T000000
-TZNAME:ICT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19310501T000000
-RDATE:19310501T000000
-TZNAME:ICT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Saigon
+X-LIC-LOCATION:Asia/Saigon
+BEGIN:STANDARD
+DTSTART:19060609T000000
+RDATE:19060609T000000
+TZNAME:SMT
+TZOFFSETFROM:+070640
+TZOFFSETTO:+070620
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:ICT
+TZOFFSETFROM:+070620
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120501T000000
+RDATE:19120501T000000
+TZNAME:ICT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310501T000000
+RDATE:19310501T000000
+TZNAME:ICT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Sakhalin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Sakhalin.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Sakhalin.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,123 +1,130 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z;BYMONTH=10
-TZNAME:SAKT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T150000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:SAKT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T150000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:SAKST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-RDATE:19970330T020000
-TZNAME:SAKST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:SAKT
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920119T020000
-RDATE:19920119T020000
-TZNAME:SAKST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920328T230000
-RDATE:19920328T230000
-TZNAME:SAKST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-RDATE:19961027T030000
-TZNAME:SAKT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;UNTIL=19960330T150000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:SAKST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;UNTIL=19950923T150000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:SAKT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19971026T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:SAKT
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19980329T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:SAKST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T120000Z;BYMONTH=10
+TZNAME:SAKT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T150000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:SAKT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:SAKST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+RDATE:19970330T020000
+TZNAME:SAKST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:SAKT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:SAKST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:SAKST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+RDATE:19961027T030000
+TZNAME:SAKT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=19960330T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:SAKST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T150000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:SAKT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19971026T030000
+RRULE:FREQ=YEARLY;UNTIL=20101030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:SAKT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19980329T020000
+RRULE:FREQ=YEARLY;UNTIL=20100327T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:SAKST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:SAKT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Samarkand.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Samarkand.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Samarkand.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,93 +1,93 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Samarkand
-X-LIC-LOCATION:Asia/Samarkand
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:SAMT
-TZOFFSETFROM:+042712
-TZOFFSETTO:+0400
-END:STANDARD
-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
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
-TZNAME:SAMT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
-TZNAME:SAMST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:SAMT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19910330T210000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:SAMST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910901T000000
-RDATE:19910901T000000
-TZNAME:UZST
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:UZT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920101T000000
-RDATE:19920101T000000
-TZNAME:UZT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Samarkand
+X-LIC-LOCATION:Asia/Samarkand
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:SAMT
+TZOFFSETFROM:+042712
+TZOFFSETTO:+0400
+END:STANDARD
+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
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:SAMT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T190000Z;BYMONTH=4
+TZNAME:SAMST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:SAMT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19910330T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:SAMST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910901T000000
+RDATE:19910901T000000
+TZNAME:UZST
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:UZT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
+TZNAME:UZT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Seoul.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Seoul.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Seoul.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,68 +1,68 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Seoul
-X-LIC-LOCATION:Asia/Seoul
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:KST
-TZOFFSETFROM:+082752
-TZOFFSETTO:+0830
-END:STANDARD
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-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
-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
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Seoul
+X-LIC-LOCATION:Asia/Seoul
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KST
+TZOFFSETFROM:+082752
+TZOFFSETTO:+0830
+END:STANDARD
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Shanghai.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,54 +1,54 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Shanghai
-X-LIC-LOCATION:Asia/Shanghai
-BEGIN:STANDARD
-DTSTART:19280101T000000
-RDATE:19280101T000000
-TZNAME:CST
-TZOFFSETFROM:+080552
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400603T000000
-RDATE:19400603T000000
-RDATE:19410316T000000
-RDATE:19860504T000000
-TZNAME:CDT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Shanghai
+X-LIC-LOCATION:Asia/Shanghai
+BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:CST
+TZOFFSETFROM:+080552
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400603T000000
+RDATE:19400603T000000
+RDATE:19410316T000000
+RDATE:19860504T000000
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+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
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Singapore.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Singapore.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Singapore.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19050601T000000
-RDATE:19050601T000000
-TZNAME:MALT
-TZOFFSETFROM:+065525
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19330101T000000
-RDATE:19330101T000000
-TZNAME:MALST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0720
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19360101T000000
-RDATE:19360101T000000
-TZNAME:MALT
-TZOFFSETFROM:+0720
-TZOFFSETTO:+0720
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410901T000000
-RDATE:19410901T000000
-TZNAME:MALT
-TZOFFSETFROM:+0720
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420216T000000
-RDATE:19420216T000000
-TZNAME:JST
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450912T000000
-RDATE:19450912T000000
-TZNAME:MALT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19650809T000000
-RDATE:19650809T000000
-TZNAME:SGT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820101T000000
-RDATE:19820101T000000
-TZNAME:SGT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Singapore
+X-LIC-LOCATION:Asia/Singapore
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:SMT
+TZOFFSETFROM:+065525
+TZOFFSETTO:+065525
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19050601T000000
+RDATE:19050601T000000
+TZNAME:MALT
+TZOFFSETFROM:+065525
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+TZNAME:MALST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0720
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19360101T000000
+RDATE:19360101T000000
+TZNAME:MALT
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0720
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410901T000000
+RDATE:19410901T000000
+TZNAME:MALT
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420216T000000
+RDATE:19420216T000000
+TZNAME:JST
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450912T000000
+RDATE:19450912T000000
+TZNAME:MALT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19650809T000000
+RDATE:19650809T000000
+TZNAME:SGT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:SGT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Taipei.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Taipei.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Taipei.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,87 +1,87 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19451001T000000
-RRULE:FREQ=YEARLY;UNTIL=19510930T150000Z;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19530401T000000
-RRULE:FREQ=YEARLY;UNTIL=19590331T160000Z;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19551001T000000
-RRULE:FREQ=YEARLY;UNTIL=19610930T150000Z;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19600601T000000
-RRULE:FREQ=YEARLY;UNTIL=19610531T160000Z;BYMONTH=6
-TZNAME:CDT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19740401T000000
-RRULE:FREQ=YEARLY;UNTIL=19750331T160000Z;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19741001T000000
-RRULE:FREQ=YEARLY;UNTIL=19750930T150000Z;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19790930T000000
-RDATE:19790930T000000
-TZNAME:CST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19451001T000000
+RRULE:FREQ=YEARLY;UNTIL=19510930T150000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19530401T000000
+RRULE:FREQ=YEARLY;UNTIL=19590331T160000Z;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19551001T000000
+RRULE:FREQ=YEARLY;UNTIL=19610930T150000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19600601T000000
+RRULE:FREQ=YEARLY;UNTIL=19610531T160000Z;BYMONTH=6
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19740401T000000
+RRULE:FREQ=YEARLY;UNTIL=19750331T160000Z;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19741001T000000
+RRULE:FREQ=YEARLY;UNTIL=19750930T150000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790930T000000
+RDATE:19790930T000000
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tbilisi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tbilisi.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tbilisi.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,152 +1,152 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Tbilisi
-X-LIC-LOCATION:Asia/Tbilisi
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:TBMT
-TZOFFSETFROM:+025916
-TZOFFSETTO:+025916
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:TBIT
-TZOFFSETFROM:+025916
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19570301T000000
-RDATE:19570301T000000
-TZNAME:TBIST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
-TZNAME:TBIST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
-TZNAME:TBIT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:TBIT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-TZNAME:TBIST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910409T000000
-RDATE:19910409T000000
-RDATE:19940925T000000
-TZNAME:GEST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-RDATE:20041031T030000
-TZNAME:GET
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920101T000000
-RDATE:19920101T000000
-TZNAME:GEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-END:STANDARD
-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
-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
-DTSTART:19950924T000000
-RDATE:19950924T000000
-TZNAME:GET
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961027T000000
-RDATE:19961027T000000
-RDATE:19970330T000000
-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
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20040627T000000
-RDATE:20040627T000000
-TZNAME:GEST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20050327T020000
-RDATE:20050327T020000
-TZNAME:GET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Tbilisi
+X-LIC-LOCATION:Asia/Tbilisi
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:TBMT
+TZOFFSETFROM:+025916
+TZOFFSETTO:+025916
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:TBIT
+TZOFFSETFROM:+025916
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570301T000000
+RDATE:19570301T000000
+TZNAME:TBIST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
+TZNAME:TBIST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:TBIT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:TBIT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+TZNAME:TBIST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910409T000000
+RDATE:19910409T000000
+RDATE:19940925T000000
+TZNAME:GEST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+RDATE:20041031T030000
+TZNAME:GET
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
+TZNAME:GEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+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
+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
+DTSTART:19950924T000000
+RDATE:19950924T000000
+TZNAME:GET
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T000000
+RDATE:19961027T000000
+RDATE:19970330T000000
+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
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20040627T000000
+RDATE:20040627T000000
+TZNAME:GEST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tehran.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,159 +1,159 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Tehran
-X-LIC-LOCATION:Asia/Tehran
-BEGIN:STANDARD
-DTSTART:19160101T000000
-RDATE:19160101T000000
-TZNAME:TMT
-TZOFFSETFROM:+032544
-TZOFFSETTO:+032544
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-TZNAME:IRST
-TZOFFSETFROM:+032544
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19771101T000000
-RDATE:19771101T000000
-TZNAME:IRST
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19780321T000000
-RDATE:19780321T000000
-TZNAME:IRDT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19781021T000000
-RDATE:19781021T000000
-TZNAME:IRST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19790101T000000
-RDATE:19790101T000000
-TZNAME:IRST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19790321T000000
-RRULE:FREQ=YEARLY;UNTIL=19800320T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910922T000000
-RRULE:FREQ=YEARLY;UNTIL=19950921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920322T000000
-RRULE:FREQ=YEARLY;UNTIL=19950321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19970322T000000
-RRULE:FREQ=YEARLY;UNTIL=19990321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19970922T000000
-RRULE:FREQ=YEARLY;UNTIL=19990921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20010322T000000
-RRULE:FREQ=YEARLY;UNTIL=20030321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010922T000000
-RRULE:FREQ=YEARLY;UNTIL=20030921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20090322T000000
-RRULE:FREQ=YEARLY;UNTIL=20110321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20090922T000000
-RRULE:FREQ=YEARLY;UNTIL=20110921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20130322T000000
-RRULE:FREQ=YEARLY;UNTIL=20150321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20130922T000000
-RRULE:FREQ=YEARLY;UNTIL=20150921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Tehran
+X-LIC-LOCATION:Asia/Tehran
+BEGIN:STANDARD
+DTSTART:19160101T000000
+RDATE:19160101T000000
+TZNAME:TMT
+TZOFFSETFROM:+032544
+TZOFFSETTO:+032544
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:IRST
+TZOFFSETFROM:+032544
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19771101T000000
+RDATE:19771101T000000
+TZNAME:IRST
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19780321T000000
+RDATE:19780321T000000
+TZNAME:IRDT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19781021T000000
+RDATE:19781021T000000
+TZNAME:IRST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790101T000000
+RDATE:19790101T000000
+TZNAME:IRST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19790321T000000
+RRULE:FREQ=YEARLY;UNTIL=19800320T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910922T000000
+RRULE:FREQ=YEARLY;UNTIL=19950921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920322T000000
+RRULE:FREQ=YEARLY;UNTIL=19950321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19970322T000000
+RRULE:FREQ=YEARLY;UNTIL=19990321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19970922T000000
+RRULE:FREQ=YEARLY;UNTIL=19990921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010322T000000
+RRULE:FREQ=YEARLY;UNTIL=20030321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010922T000000
+RRULE:FREQ=YEARLY;UNTIL=20030921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20090322T000000
+RRULE:FREQ=YEARLY;UNTIL=20110321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20090922T000000
+RRULE:FREQ=YEARLY;UNTIL=20110921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20130322T000000
+RRULE:FREQ=YEARLY;UNTIL=20150321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20130922T000000
+RRULE:FREQ=YEARLY;UNTIL=20150921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tel_Aviv.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tel_Aviv.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tel_Aviv.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,164 +1,164 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Tel_Aviv
-X-LIC-LOCATION:Asia/Tel_Aviv
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:JMT
-TZOFFSETFROM:+022056
-TZOFFSETTO:+022040
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180101T000000
-RDATE:19180101T000000
-TZNAME:IST
-TZOFFSETFROM:+022040
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400601T000000
-RDATE:19400601T000000
-RDATE:19430401T020000
-RDATE:19440401T000000
-RDATE:19450416T000000
-RDATE:19460416T020000
-RDATE:19490501T000000
-RDATE:19500416T000000
-RDATE:19510401T000000
-RDATE:19520420T020000
-RDATE:19530412T020000
-RDATE:19540613T000000
-RDATE:19550611T020000
-RDATE:19560603T000000
-RDATE:19570429T020000
-RDATE:19740707T000000
-RDATE:19750420T000000
-RDATE:19850414T000000
-RDATE:19860518T000000
-RDATE:19870415T000000
-RDATE:19880409T000000
-RDATE:19890430T000000
-RDATE:19900325T000000
-RDATE:19910324T000000
-RDATE:19920329T000000
-RDATE:19930402T000000
-RDATE:19940401T000000
-RDATE:19950331T000000
-RDATE:19960315T000000
-RDATE:19970321T000000
-RDATE:19980320T000000
-RDATE:19990402T020000
-RDATE:20000414T020000
-RDATE:20010409T010000
-RDATE:20020329T010000
-RDATE:20030328T010000
-RDATE:20040407T010000
-RDATE:20050401T020000
-RDATE:20110401T020000
-RDATE:20160401T020000
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19451101T020000
-RDATE:19451101T020000
-RDATE:19461101T000000
-RDATE:19500915T030000
-RDATE:19511111T030000
-RDATE:19521019T030000
-RDATE:19530913T030000
-RDATE:19540912T000000
-RDATE:19550911T000000
-RDATE:19560930T030000
-RDATE:19570922T000000
-RDATE:19741013T000000
-RDATE:19750831T000000
-RDATE:19850915T000000
-RDATE:19860907T000000
-RDATE:19870913T000000
-RDATE:19880903T000000
-RDATE:19890903T000000
-RDATE:19900826T000000
-RDATE:19910901T000000
-RDATE:19920906T000000
-RDATE:19930905T000000
-RDATE:19940828T000000
-RDATE:19950903T000000
-RDATE:19960916T000000
-RDATE:19970914T000000
-RDATE:19980906T000000
-RDATE:19990903T020000
-RDATE:20001006T010000
-RDATE:20010924T010000
-RDATE:20021007T010000
-RDATE:20031003T010000
-RDATE:20040922T010000
-RDATE:20051009T020000
-RDATE:20061001T020000
-RDATE:20070916T020000
-RDATE:20081005T020000
-RDATE:20090927T020000
-RDATE:20100912T020000
-RDATE:20111002T020000
-RDATE:20120923T020000
-RDATE:20130908T020000
-RDATE:20140928T020000
-RDATE:20150920T020000
-RDATE:20161009T020000
-RDATE:20170924T020000
-TZNAME:IST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Tel_Aviv
+X-LIC-LOCATION:Asia/Tel_Aviv
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:JMT
+TZOFFSETFROM:+022056
+TZOFFSETTO:+022040
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+TZNAME:IST
+TZOFFSETFROM:+022040
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400601T000000
+RDATE:19400601T000000
+RDATE:19430401T020000
+RDATE:19440401T000000
+RDATE:19450416T000000
+RDATE:19460416T020000
+RDATE:19490501T000000
+RDATE:19500416T000000
+RDATE:19510401T000000
+RDATE:19520420T020000
+RDATE:19530412T020000
+RDATE:19540613T000000
+RDATE:19550611T020000
+RDATE:19560603T000000
+RDATE:19570429T020000
+RDATE:19740707T000000
+RDATE:19750420T000000
+RDATE:19850414T000000
+RDATE:19860518T000000
+RDATE:19870415T000000
+RDATE:19880409T000000
+RDATE:19890430T000000
+RDATE:19900325T000000
+RDATE:19910324T000000
+RDATE:19920329T000000
+RDATE:19930402T000000
+RDATE:19940401T000000
+RDATE:19950331T000000
+RDATE:19960315T000000
+RDATE:19970321T000000
+RDATE:19980320T000000
+RDATE:19990402T020000
+RDATE:20000414T020000
+RDATE:20010409T010000
+RDATE:20020329T010000
+RDATE:20030328T010000
+RDATE:20040407T010000
+RDATE:20050401T020000
+RDATE:20110401T020000
+RDATE:20160401T020000
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451101T020000
+RDATE:19451101T020000
+RDATE:19461101T000000
+RDATE:19500915T030000
+RDATE:19511111T030000
+RDATE:19521019T030000
+RDATE:19530913T030000
+RDATE:19540912T000000
+RDATE:19550911T000000
+RDATE:19560930T030000
+RDATE:19570922T000000
+RDATE:19741013T000000
+RDATE:19750831T000000
+RDATE:19850915T000000
+RDATE:19860907T000000
+RDATE:19870913T000000
+RDATE:19880903T000000
+RDATE:19890903T000000
+RDATE:19900826T000000
+RDATE:19910901T000000
+RDATE:19920906T000000
+RDATE:19930905T000000
+RDATE:19940828T000000
+RDATE:19950903T000000
+RDATE:19960916T000000
+RDATE:19970914T000000
+RDATE:19980906T000000
+RDATE:19990903T020000
+RDATE:20001006T010000
+RDATE:20010924T010000
+RDATE:20021007T010000
+RDATE:20031003T010000
+RDATE:20040922T010000
+RDATE:20051009T020000
+RDATE:20061001T020000
+RDATE:20070916T020000
+RDATE:20081005T020000
+RDATE:20090927T020000
+RDATE:20100912T020000
+RDATE:20111002T020000
+RDATE:20120923T020000
+RDATE:20130908T020000
+RDATE:20140928T020000
+RDATE:20150920T020000
+RDATE:20161009T020000
+RDATE:20170924T020000
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+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;BYMONTH=3
+TZNAME:IDT
+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;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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimbu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19871001T000000
-RDATE:19871001T000000
-TZNAME:BTT
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Thimbu
+X-LIC-LOCATION:Asia/Thimbu
+BEGIN:STANDARD
+DTSTART:19470815T000000
+RDATE:19470815T000000
+TZNAME:IST
+TZOFFSETFROM:+055836
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19871001T000000
+RDATE:19871001T000000
+TZNAME:BTT
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimphu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimphu.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Thimphu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19871001T000000
-RDATE:19871001T000000
-TZNAME:BTT
-TZOFFSETFROM:+0530
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Thimphu
+X-LIC-LOCATION:Asia/Thimphu
+BEGIN:STANDARD
+DTSTART:19470815T000000
+RDATE:19470815T000000
+TZNAME:IST
+TZOFFSETFROM:+055836
+TZOFFSETTO:+0530
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19871001T000000
+RDATE:19871001T000000
+TZNAME:BTT
+TZOFFSETFROM:+0530
+TZOFFSETTO:+0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tokyo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tokyo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Tokyo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,52 +1,52 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Tokyo
-X-LIC-LOCATION:Asia/Tokyo
-BEGIN:STANDARD
-DTSTART:18880101T001859
-RDATE:18880101T001859
-TZNAME:JST
-TZOFFSETFROM:+091859
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18960101T000000
-RDATE:18960101T000000
-TZNAME:CJT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19380101T000000
-RDATE:19380101T000000
-TZNAME:JST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:DAYLIGHT
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Tokyo
+X-LIC-LOCATION:Asia/Tokyo
+BEGIN:STANDARD
+DTSTART:18880101T001859
+RDATE:18880101T001859
+TZNAME:JST
+TZOFFSETFROM:+091859
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18960101T000000
+RDATE:18960101T000000
+TZNAME:CJT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19380101T000000
+RDATE:19380101T000000
+TZNAME:JST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:DAYLIGHT
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ujung_Pandang.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19321101T000000
-RDATE:19321101T000000
-TZNAME:CIT
-TZOFFSETFROM:+075736
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420209T000000
-RDATE:19420209T000000
-TZNAME:JST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450923T000000
-RDATE:19450923T000000
-TZNAME:CIT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Ujung_Pandang
+X-LIC-LOCATION:Asia/Ujung_Pandang
+BEGIN:STANDARD
+DTSTART:19200101T000000
+RDATE:19200101T000000
+TZNAME:MMT
+TZOFFSETFROM:+075736
+TZOFFSETTO:+075736
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19321101T000000
+RDATE:19321101T000000
+TZNAME:CIT
+TZOFFSETFROM:+075736
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420209T000000
+RDATE:19420209T000000
+TZNAME:JST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450923T000000
+RDATE:19450923T000000
+TZNAME:CIT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulaanbaatar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulaanbaatar.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulaanbaatar.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20010428T020000
-RDATE:20010428T020000
-TZNAME:ULAST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010929T020000
-RRULE:FREQ=YEARLY;UNTIL=20060929T170000Z;BYDAY=-1SA;BYMONTH=9
-TZNAME:ULAT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20020330T020000
-RRULE:FREQ=YEARLY;UNTIL=20060324T180000Z;BYDAY=-1SA;BYMONTH=3
-TZNAME:ULAST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20010428T020000
+RDATE:20010428T020000
+TZNAME:ULAST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;UNTIL=20060929T170000Z;BYDAY=-1SA;BYMONTH=9
+TZNAME:ULAT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;UNTIL=20060324T180000Z;BYDAY=-1SA;BYMONTH=3
+TZNAME:ULAST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulan_Bator.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulan_Bator.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Ulan_Bator.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20010428T020000
-RDATE:20010428T020000
-TZNAME:ULAST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010929T020000
-RRULE:FREQ=YEARLY;UNTIL=20060929T170000Z;BYDAY=-1SA;BYMONTH=9
-TZNAME:ULAT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20020330T020000
-RRULE:FREQ=YEARLY;UNTIL=20060324T180000Z;BYDAY=-1SA;BYMONTH=3
-TZNAME:ULAST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20010428T020000
+RDATE:20010428T020000
+TZNAME:ULAST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010929T020000
+RRULE:FREQ=YEARLY;UNTIL=20060929T170000Z;BYDAY=-1SA;BYMONTH=9
+TZNAME:ULAT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20020330T020000
+RRULE:FREQ=YEARLY;UNTIL=20060324T180000Z;BYDAY=-1SA;BYMONTH=3
+TZNAME:ULAST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Urumqi.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Urumqi.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Urumqi.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,45 +1,45 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Urumqi
-X-LIC-LOCATION:Asia/Urumqi
-BEGIN:STANDARD
-DTSTART:19280101T000000
-RDATE:19280101T000000
-TZNAME:URUT
-TZOFFSETFROM:+055020
-TZOFFSETTO:+0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800501T000000
-RDATE:19800501T000000
-TZNAME:CST
-TZOFFSETFROM:+0600
-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
-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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Urumqi
+X-LIC-LOCATION:Asia/Urumqi
+BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:URUT
+TZOFFSETFROM:+055020
+TZOFFSETTO:+0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800501T000000
+RDATE:19800501T000000
+TZNAME:CST
+TZOFFSETFROM:+0600
+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
+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
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vientiane.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vientiane.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vientiane.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110311T000100
-RDATE:19110311T000100
-TZNAME:ICT
-TZOFFSETFROM:+070620
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120501T000000
-RDATE:19120501T000000
-TZNAME:ICT
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19310501T000000
-RDATE:19310501T000000
-TZNAME:ICT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0700
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Vientiane
+X-LIC-LOCATION:Asia/Vientiane
+BEGIN:STANDARD
+DTSTART:19060609T000000
+RDATE:19060609T000000
+TZNAME:SMT
+TZOFFSETFROM:+065024
+TZOFFSETTO:+070620
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:ICT
+TZOFFSETFROM:+070620
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120501T000000
+RDATE:19120501T000000
+TZNAME:ICT
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310501T000000
+RDATE:19310501T000000
+TZNAME:ICT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vladivostok.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vladivostok.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Vladivostok.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +1,108 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Vladivostok
-X-LIC-LOCATION:Asia/Vladivostok
-BEGIN:STANDARD
-DTSTART:19221115T000000
-RDATE:19221115T000000
-TZNAME:VLAT
-TZOFFSETFROM:+084744
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300621T000000
-RDATE:19300621T000000
-RDATE:19920119T020000
-TZNAME:VLAST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T140000Z;BYMONTH=4
-TZNAME:VLAST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T130000Z;BYMONTH=10
-TZNAME:VLAT
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T160000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:VLAT
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T160000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:VLAST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-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
-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
-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
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Vladivostok
+X-LIC-LOCATION:Asia/Vladivostok
+BEGIN:STANDARD
+DTSTART:19221115T000000
+RDATE:19221115T000000
+TZNAME:VLAT
+TZOFFSETFROM:+084744
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+RDATE:19920119T020000
+TZNAME:VLAST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T140000Z;BYMONTH=4
+TZNAME:VLAST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T130000Z;BYMONTH=10
+TZNAME:VLAT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T160000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:VLAT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:VLAST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+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
+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;UNTIL=20100327T160000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:VLAST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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;UNTIL=20101030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:VLAT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:VLAT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yakutsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yakutsk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yakutsk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +1,108 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T140000Z;BYMONTH=10
-TZNAME:YAKT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T170000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:YAKT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T170000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:YAKST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-TZNAME:YAKST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:YAKT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920328T230000
-RDATE:19920328T230000
-TZNAME:YAKST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:YAKT
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:YAKST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-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
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T140000Z;BYMONTH=10
+TZNAME:YAKT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T170000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:YAKT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T170000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:YAKST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:YAKST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:YAKT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:YAKST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:YAKT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20100327T170000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:YAKST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+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;UNTIL=20101030T170000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:YAKT
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:YAKT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yekaterinburg.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yekaterinburg.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yekaterinburg.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,107 +1,114 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
-TZNAME:SVET
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:SVET
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:SVEST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-TZNAME:SVEST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:SVET
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920119T020000
-RDATE:19920119T020000
-TZNAME:YEKST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920328T230000
-RDATE:19920328T230000
-TZNAME:YEKST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:YEKT
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:YEKST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-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
-TZOFFSETFROM:+0600
-TZOFFSETTO:+0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T180000Z;BYMONTH=10
+TZNAME:SVET
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:SVET
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:SVEST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:SVEST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:SVET
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920119T020000
+RDATE:19920119T020000
+TZNAME:YEKST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920328T230000
+RDATE:19920328T230000
+TZNAME:YEKST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:YEKT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20100327T210000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:YEKST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+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;UNTIL=20101030T210000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:YEKT
+TZOFFSETFROM:+0600
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:YEKT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yerevan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yerevan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Asia/Yerevan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,116 +1,116 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Asia/Yerevan
-X-LIC-LOCATION:Asia/Yerevan
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:YERT
-TZOFFSETFROM:+0258
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19570301T000000
-RDATE:19570301T000000
-TZNAME:YERST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
-TZNAME:YERST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
-TZNAME:YERT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:YERT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19900324T220000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:YERST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-TZNAME:YERST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910923T000000
-RDATE:19910923T000000
-RDATE:19970101T000000
-TZNAME:AMST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-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
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;UNTIL=19940924T230000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AMT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19950924T030000
-RDATE:19950924T030000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Asia/Yerevan
+X-LIC-LOCATION:Asia/Yerevan
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:YERT
+TZOFFSETFROM:+0258
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570301T000000
+RDATE:19570301T000000
+TZNAME:YERST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T200000Z;BYMONTH=4
+TZNAME:YERST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:YERT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:YERT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19900324T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:YERST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:YERST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910923T000000
+RDATE:19910923T000000
+RDATE:19970101T000000
+TZNAME:AMST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+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
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19940924T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AMT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19950924T030000
+RDATE:19950924T030000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Azores.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,266 +1,267 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19401006T000000
-RRULE:FREQ=YEARLY;UNTIL=19411006T010000Z;BYMONTH=10
-TZNAME:AZOT
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-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
-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
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19470406T020000
-RRULE:FREQ=YEARLY;UNTIL=19490403T040000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:AZOST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;UNTIL=19491002T040000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:AZOT
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510401T020000
-RRULE:FREQ=YEARLY;UNTIL=19650404T040000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:AZOST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19511007T030000
-RRULE:FREQ=YEARLY;UNTIL=19651003T040000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:AZOT
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19770925T010000
-RDATE:19770925T010000
-RDATE:19781001T010000
-TZNAME:AZOT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19780402T000000
-RRULE:FREQ=YEARLY;UNTIL=19790401T010000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:AZOST
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;UNTIL=19820926T020000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AZOT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19820328T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:AZOST
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T020000
-RRULE:FREQ=YEARLY;UNTIL=19910929T020000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AZOT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19840325T010000
-RRULE:FREQ=YEARLY;UNTIL=19920329T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:AZOST
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920927T020000
-RDATE:19920927T020000
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T010000
-RDATE:19930328T010000
-TZNAME:AZOST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19930926T010000
-RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AZOT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19940327T000000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:AZOST
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:AZOT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291006T010000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:AZOT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;UNTIL=19321002T010000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:AZOT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;UNTIL=19381002T010000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:AZOT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411006T010000Z;BYMONTH=10
+TZNAME:AZOT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+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
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;UNTIL=19451028T010000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:AZOT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430829T000000
+RRULE:FREQ=YEARLY;UNTIL=19450826T000000Z;BYDAY=SU;BYYEARDAY=-122,-123,-124
+ ,-125,-126,-127,-128
+TZNAME:AZOST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;UNTIL=19490403T040000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AZOST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:AZOT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;UNTIL=19650404T040000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AZOST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;UNTIL=19651003T040000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:AZOT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19770925T010000
+RDATE:19770925T010000
+RDATE:19781001T010000
+TZNAME:AZOT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;UNTIL=19790401T010000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:AZOST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19820926T020000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AZOT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19820328T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:AZOST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T020000
+RRULE:FREQ=YEARLY;UNTIL=19910929T020000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AZOT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;UNTIL=19920329T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:AZOST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920927T020000
+RDATE:19920927T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T010000
+RDATE:19930328T010000
+TZNAME:AZOST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T010000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AZOT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19940327T000000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:AZOST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:AZOT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Bermuda.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Bermuda.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Bermuda.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-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
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Canary.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Canary.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Canary.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Atlantic/Canary
-X-LIC-LOCATION:Atlantic/Canary
-BEGIN:STANDARD
-DTSTART:19220301T000000
-RDATE:19220301T000000
-TZNAME:CANT
-TZOFFSETFROM:-010136
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19460930T010000
-RDATE:19460930T010000
-TZNAME:WET
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800406T000000
-RDATE:19800406T000000
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800928T010000
-RDATE:19800928T010000
-TZNAME:WEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800928T020000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Atlantic/Canary
+X-LIC-LOCATION:Atlantic/Canary
+BEGIN:STANDARD
+DTSTART:19220301T000000
+RDATE:19220301T000000
+TZNAME:CANT
+TZOFFSETFROM:-010136
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460930T010000
+RDATE:19460930T010000
+TZNAME:WET
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800406T000000
+RDATE:19800406T000000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T010000
+RDATE:19800928T010000
+TZNAME:WEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800928T020000
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Cape_Verde.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Cape_Verde.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Cape_Verde.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420901T000000
-RDATE:19420901T000000
-TZNAME:CVST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19451015T000000
-RDATE:19451015T000000
-TZNAME:CVT
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19751125T020000
-RDATE:19751125T020000
-TZNAME:CVT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Atlantic/Cape_Verde
+X-LIC-LOCATION:Atlantic/Cape_Verde
+BEGIN:STANDARD
+DTSTART:19070101T000000
+RDATE:19070101T000000
+TZNAME:CVT
+TZOFFSETFROM:-013404
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420901T000000
+RDATE:19420901T000000
+TZNAME:CVST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451015T000000
+RDATE:19451015T000000
+TZNAME:CVT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19751125T020000
+RDATE:19751125T020000
+TZNAME:CVT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faeroe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faeroe.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faeroe.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19810927T020000
-RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19810927T020000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faroe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faroe.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Faroe.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19810927T020000
-RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19810927T020000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Jan_Mayen.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Jan_Mayen.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Jan_Mayen.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,88 +1,88 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19160930T000000
-RDATE:19160930T000000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451001T030000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19590920T030000
-RRULE:FREQ=YEARLY;UNTIL=19650919T010000Z;BYDAY=3SU;BYMONTH=9
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19160930T000000
+RDATE:19160930T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19590920T030000
+RRULE:FREQ=YEARLY;UNTIL=19650919T010000Z;BYDAY=3SU;BYMONTH=9
+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
+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/Atlantic/Madeira.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Madeira.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Madeira.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,238 +1,239 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19401006T000000
-RRULE:FREQ=YEARLY;UNTIL=19411006T000000Z;BYMONTH=10
-TZNAME:MADT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-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
-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
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19470406T020000
-RRULE:FREQ=YEARLY;UNTIL=19490403T030000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:MADST
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;UNTIL=19491002T030000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:MADT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510401T020000
-RRULE:FREQ=YEARLY;UNTIL=19650404T030000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:MADST
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19511007T030000
-RRULE:FREQ=YEARLY;UNTIL=19651003T030000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:MADT
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19660403T020000
-RDATE:19660403T020000
-TZNAME:WEST
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19770327T000000
-RDATE:19770327T000000
-RDATE:19800330T000000
-RDATE:19830327T020000
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19770925T010000
-RDATE:19770925T010000
-RDATE:19781001T010000
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19780402T000000
-RRULE:FREQ=YEARLY;UNTIL=19790401T000000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;UNTIL=19820926T010000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19820328T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T020000
-RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19840325T010000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291006T000000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:MADT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;UNTIL=19321002T000000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:MADT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;UNTIL=19381002T000000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:MADT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411006T000000Z;BYMONTH=10
+TZNAME:MADT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+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
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;UNTIL=19451028T000000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:MADT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430829T000000
+RRULE:FREQ=YEARLY;UNTIL=19450825T230000Z;BYDAY=SU;BYYEARDAY=-122,-123,-124
+ ,-125,-126,-127,-128
+TZNAME:MADST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;UNTIL=19490403T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MADST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T030000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MADT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;UNTIL=19650404T030000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MADST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;UNTIL=19651003T030000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MADT
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660403T020000
+RDATE:19660403T020000
+TZNAME:WEST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770327T000000
+RDATE:19770327T000000
+RDATE:19800330T000000
+RDATE:19830327T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19770925T010000
+RDATE:19770925T010000
+RDATE:19781001T010000
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;UNTIL=19790401T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19820926T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19820328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T020000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840325T010000
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Reykjavik.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Reykjavik.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Reykjavik.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,89 +1,89 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Atlantic/Reykjavik
-X-LIC-LOCATION:Atlantic/Reykjavik
-BEGIN:STANDARD
-DTSTART:18370101T000000
-RDATE:18370101T000000
-TZNAME:RMT
-TZOFFSETFROM:-012724
-TZOFFSETTO:-012748
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19080101T000000
-RDATE:19080101T000000
-TZNAME:ISST
-TZOFFSETFROM:-012748
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170219T230000
-RRULE:FREQ=YEARLY;UNTIL=19180220T000000Z;BYMONTH=2
-TZNAME:ISST
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19171021T010000
-RDATE:19171021T010000
-RDATE:19181116T010000
-RDATE:19391129T020000
-RDATE:19401103T020000
-RDATE:19411102T020000
-RDATE:19421025T020000
-RDATE:19491030T020000
-RDATE:19671029T020000
-TZNAME:IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Atlantic/Reykjavik
+X-LIC-LOCATION:Atlantic/Reykjavik
+BEGIN:STANDARD
+DTSTART:18370101T000000
+RDATE:18370101T000000
+TZNAME:RMT
+TZOFFSETFROM:-012724
+TZOFFSETTO:-012748
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19080101T000000
+RDATE:19080101T000000
+TZNAME:ISST
+TZOFFSETFROM:-012748
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170219T230000
+RRULE:FREQ=YEARLY;UNTIL=19180220T000000Z;BYMONTH=2
+TZNAME:ISST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19171021T010000
+RDATE:19171021T010000
+RDATE:19181116T010000
+RDATE:19391129T020000
+RDATE:19401103T020000
+RDATE:19411102T020000
+RDATE:19421025T020000
+RDATE:19491030T020000
+RDATE:19671029T020000
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/South_Georgia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Atlantic/South_Georgia
+X-LIC-LOCATION:Atlantic/South_Georgia
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:GST
+TZOFFSETFROM:-022608
+TZOFFSETTO:-0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/St_Helena.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/St_Helena.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/St_Helena.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19510101T000000
-RDATE:19510101T000000
-TZNAME:GMT
-TZOFFSETFROM:-002248
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Atlantic/St_Helena
+X-LIC-LOCATION:Atlantic/St_Helena
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:JMT
+TZOFFSETFROM:-002248
+TZOFFSETTO:-002248
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:GMT
+TZOFFSETFROM:-002248
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Stanley.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Stanley.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Atlantic/Stanley.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,118 +1,139 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Atlantic/Stanley
-X-LIC-LOCATION:Atlantic/Stanley
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:SMT
-TZOFFSETFROM:-035124
-TZOFFSETTO:-035124
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120312T000000
-RDATE:19120312T000000
-TZNAME:FKST
-TZOFFSETFROM:-035124
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19370926T000000
-RRULE:FREQ=YEARLY;UNTIL=19380925T040000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:FKST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19380320T000000
-RRULE:FREQ=YEARLY;UNTIL=19420322T030000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
- 3,24,25;BYMONTH=3
-TZNAME:FKT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19430101T000000
-RDATE:19430101T000000
-TZNAME:FKT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19830501T000000
-RDATE:19830501T000000
-TZNAME:FKST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830925T000000
-RDATE:19830925T000000
-RDATE:19840916T000000
-TZNAME:FKST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840429T000000
-RRULE:FREQ=YEARLY;UNTIL=19850428T020000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:FKT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010415T020000
-RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=4
-TZNAME:FKT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20010902T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=9
-TZNAME:FKST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Atlantic/Stanley
+X-LIC-LOCATION:Atlantic/Stanley
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:SMT
+TZOFFSETFROM:-035124
+TZOFFSETTO:-035124
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120312T000000
+RDATE:19120312T000000
+TZNAME:FKST
+TZOFFSETFROM:-035124
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19370926T000000
+RRULE:FREQ=YEARLY;UNTIL=19380925T040000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:FKST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19380320T000000
+RRULE:FREQ=YEARLY;UNTIL=19420322T030000Z;BYDAY=SU;BYMONTHDAY=19,20,21,22,2
+ 3,24,25;BYMONTH=3
+TZNAME:FKT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19430101T000000
+RDATE:19430101T000000
+TZNAME:FKT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19830501T000000
+RDATE:19830501T000000
+TZNAME:FKST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830925T000000
+RDATE:19830925T000000
+RDATE:19840916T000000
+TZNAME:FKST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840429T000000
+RRULE:FREQ=YEARLY;UNTIL=19850428T020000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:FKT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010415T020000
+RRULE:FREQ=YEARLY;UNTIL=20100418T050000Z;BYDAY=3SU;BYMONTH=4
+TZNAME:FKT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010902T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=9
+TZNAME:FKST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20110904T020000
+RDATE:20110904T020000
+TZNAME:FKST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20120415T020000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=4
+TZNAME:FKT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20120902T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=9
+TZNAME:FKST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/ACT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/ACT.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/ACT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,124 +1,124 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/ACT
-X-LIC-LOCATION:Australia/ACT
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:EST
-TZOFFSETFROM:+100452
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/ACT
+X-LIC-LOCATION:Australia/ACT
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+100452
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Adelaide.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Adelaide.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Adelaide.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,112 +1,112 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Adelaide
-X-LIC-LOCATION:Australia/Adelaide
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:CST
-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
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;UNTIL=19900317T163000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=20071027T163000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19950326T030000
-RRULE:FREQ=YEARLY;UNTIL=20050326T163000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-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
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Adelaide
+X-LIC-LOCATION:Australia/Adelaide
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:CST
+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
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T163000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T163000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+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
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Brisbane.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Brisbane.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Brisbane.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,64 +1,64 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Brisbane
-X-LIC-LOCATION:Australia/Brisbane
-BEGIN:STANDARD
-DTSTART:18950101T000000
-RDATE:18950101T000000
-TZNAME:EST
-TZOFFSETFROM:+101208
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19711031T020000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Brisbane
+X-LIC-LOCATION:Australia/Brisbane
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:EST
+TZOFFSETFROM:+101208
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19711031T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Broken_Hill.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,151 +1,151 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Broken_Hill
-X-LIC-LOCATION:Australia/Broken_Hill
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:EST
-TZOFFSETFROM:+092548
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18960823T000000
-RDATE:18960823T000000
-TZNAME:CST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-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
-BEGIN:STANDARD
-DTSTART:19710101T000000
-RDATE:19710101T000000
-TZNAME:CST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;UNTIL=19810228T163000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19830306T030000
-RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;UNTIL=19890318T163000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=19991030T163000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;UNTIL=19950304T163000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960331T030000
-RRULE:FREQ=YEARLY;UNTIL=19990327T163000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20000101T000000
-RDATE:20000101T000000
-TZNAME:CST
-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
-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
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Broken_Hill
+X-LIC-LOCATION:Australia/Broken_Hill
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+092548
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18960823T000000
+RDATE:18960823T000000
+TZNAME:CST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+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
+BEGIN:STANDARD
+DTSTART:19710101T000000
+RDATE:19710101T000000
+TZNAME:CST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19890318T163000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19950304T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;UNTIL=19990327T163000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000101T000000
+RDATE:20000101T000000
+TZNAME:CST
+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
+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
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Canberra.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Canberra.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Canberra.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,124 +1,124 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Canberra
-X-LIC-LOCATION:Australia/Canberra
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:EST
-TZOFFSETFROM:+100452
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Canberra
+X-LIC-LOCATION:Australia/Canberra
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+100452
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Currie.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Currie.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Currie.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,137 +1,137 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Currie
-X-LIC-LOCATION:Australia/Currie
-BEGIN:STANDARD
-DTSTART:18950901T000000
-RDATE:18950901T000000
-TZNAME:EST
-TZOFFSETFROM:+093528
-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:19720227T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420101T020000
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-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:19710701T000000
-RDATE:19710701T000000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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: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;BYDAY=1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Currie
+X-LIC-LOCATION:Australia/Currie
+BEGIN:STANDARD
+DTSTART:18950901T000000
+RDATE:18950901T000000
+TZNAME:EST
+TZOFFSETFROM:+093528
+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:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420101T020000
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+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:19710701T000000
+RDATE:19710701T000000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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: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;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Darwin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Darwin.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Darwin.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,48 +1,48 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Darwin
-X-LIC-LOCATION:Australia/Darwin
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:CST
-TZOFFSETFROM:+084320
-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
-TZNAME:CST
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Darwin
+X-LIC-LOCATION:Australia/Darwin
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:CST
+TZOFFSETFROM:+084320
+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
+TZNAME:CST
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Eucla.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,62 +1,62 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Eucla
-X-LIC-LOCATION:Australia/Eucla
-BEGIN:STANDARD
-DTSTART:18951201T000000
-RDATE:18951201T000000
-TZNAME:CWST
-TZOFFSETFROM:+083528
-TZOFFSETTO:+0845
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19741027T020000
-RDATE:19831030T020000
-RDATE:19911117T020000
-RDATE:20061203T020000
-TZNAME:CWST
-TZOFFSETFROM:+0845
-TZOFFSETTO:+0945
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19430328T020000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Eucla
+X-LIC-LOCATION:Australia/Eucla
+BEGIN:STANDARD
+DTSTART:18951201T000000
+RDATE:18951201T000000
+TZNAME:CWST
+TZOFFSETFROM:+083528
+TZOFFSETTO:+0845
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19741027T020000
+RDATE:19831030T020000
+RDATE:19911117T020000
+RDATE:20061203T020000
+TZNAME:CWST
+TZOFFSETFROM:+0845
+TZOFFSETTO:+0945
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19430328T020000
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Hobart.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,146 +1,146 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Hobart
-X-LIC-LOCATION:Australia/Hobart
-BEGIN:STANDARD
-DTSTART:18950901T000000
-RDATE:18950901T000000
-TZNAME:EST
-TZOFFSETFROM:+094916
-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;BYDAY=1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Hobart
+X-LIC-LOCATION:Australia/Hobart
+BEGIN:STANDARD
+DTSTART:18950901T000000
+RDATE:18950901T000000
+TZNAME:EST
+TZOFFSETFROM:+094916
+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;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/LHI.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/LHI.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/LHI.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,103 +1,103 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=19991030T153000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:LHST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19900304T020000
-RRULE:FREQ=YEARLY;UNTIL=19950304T150000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:LHST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1030
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960331T020000
-RRULE:FREQ=YEARLY;UNTIL=20050326T150000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:LHST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1030
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;UNTIL=20071027T153000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:LHST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+1100
-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
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1030
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:LHST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+1100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900304T020000
+RRULE:FREQ=YEARLY;UNTIL=19950304T150000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:LHST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960331T020000
+RRULE:FREQ=YEARLY;UNTIL=20050326T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:LHST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+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
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:LHST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lindeman.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lindeman.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lindeman.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,79 +1,79 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Lindeman
-X-LIC-LOCATION:Australia/Lindeman
-BEGIN:STANDARD
-DTSTART:18950101T000000
-RDATE:18950101T000000
-TZNAME:EST
-TZOFFSETFROM:+095556
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19711031T020000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19710101T000000
-RDATE:19710101T000000
-RDATE:19920701T000000
-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
-BEGIN:DAYLIGHT
-DTSTART:19921025T020000
-RRULE:FREQ=YEARLY;UNTIL=19931030T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19930307T030000
-RRULE:FREQ=YEARLY;UNTIL=19940305T160000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Lindeman
+X-LIC-LOCATION:Australia/Lindeman
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:EST
+TZOFFSETFROM:+095556
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19711031T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19710101T000000
+RDATE:19710101T000000
+RDATE:19920701T000000
+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
+BEGIN:DAYLIGHT
+DTSTART:19921025T020000
+RRULE:FREQ=YEARLY;UNTIL=19931030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930307T030000
+RRULE:FREQ=YEARLY;UNTIL=19940305T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lord_Howe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lord_Howe.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Lord_Howe.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,103 +1,103 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=19991030T153000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:LHST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19900304T020000
-RRULE:FREQ=YEARLY;UNTIL=19950304T150000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:LHST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1030
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960331T020000
-RRULE:FREQ=YEARLY;UNTIL=20050326T150000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:LHST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1030
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20011028T020000
-RRULE:FREQ=YEARLY;UNTIL=20071027T153000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:LHST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+1100
-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
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1030
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:LHST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+1100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900304T020000
+RRULE:FREQ=YEARLY;UNTIL=19950304T150000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:LHST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960331T020000
+RRULE:FREQ=YEARLY;UNTIL=20050326T150000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:LHST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20011028T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T153000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:LHST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+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
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1030
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:LHST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+1100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Melbourne.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Melbourne.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Melbourne.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Melbourne
-X-LIC-LOCATION:Australia/Melbourne
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:EST
-TZOFFSETFROM:+093952
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:20000827T020000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Melbourne
+X-LIC-LOCATION:Australia/Melbourne
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+093952
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:20000827T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/NSW.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/NSW.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/NSW.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,124 +1,124 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/NSW
-X-LIC-LOCATION:Australia/NSW
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:EST
-TZOFFSETFROM:+100452
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/NSW
+X-LIC-LOCATION:Australia/NSW
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+100452
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/North.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/North.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/North.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,48 +1,48 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/North
-X-LIC-LOCATION:Australia/North
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:CST
-TZOFFSETFROM:+084320
-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
-TZNAME:CST
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/North
+X-LIC-LOCATION:Australia/North
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:CST
+TZOFFSETFROM:+084320
+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
+TZNAME:CST
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Perth.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,62 +1,62 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Perth
-X-LIC-LOCATION:Australia/Perth
-BEGIN:STANDARD
-DTSTART:18951201T000000
-RDATE:18951201T000000
-TZNAME:WST
-TZOFFSETFROM:+074324
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19741027T020000
-RDATE:19831030T020000
-RDATE:19911117T020000
-RDATE:20061203T020000
-TZNAME:WST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19430328T020000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Perth
+X-LIC-LOCATION:Australia/Perth
+BEGIN:STANDARD
+DTSTART:18951201T000000
+RDATE:18951201T000000
+TZNAME:WST
+TZOFFSETFROM:+074324
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19741027T020000
+RDATE:19831030T020000
+RDATE:19911117T020000
+RDATE:20061203T020000
+TZNAME:WST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19430328T020000
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Queensland.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,64 +1,64 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Queensland
-X-LIC-LOCATION:Australia/Queensland
-BEGIN:STANDARD
-DTSTART:18950101T000000
-RDATE:18950101T000000
-TZNAME:EST
-TZOFFSETFROM:+101208
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19711031T020000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Queensland
+X-LIC-LOCATION:Australia/Queensland
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:EST
+TZOFFSETFROM:+101208
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19711031T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/South.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,112 +1,112 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/South
-X-LIC-LOCATION:Australia/South
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:CST
-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
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;UNTIL=19900317T163000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=20071027T163000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19950326T030000
-RRULE:FREQ=YEARLY;UNTIL=20050326T163000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-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
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/South
+X-LIC-LOCATION:Australia/South
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:CST
+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
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T163000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20071027T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19950326T030000
+RRULE:FREQ=YEARLY;UNTIL=20050326T163000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+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
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Sydney.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Sydney.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Sydney.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,124 +1,124 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Sydney
-X-LIC-LOCATION:Australia/Sydney
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:EST
-TZOFFSETFROM:+100452
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:19861019T020000
-RDATE:20000827T020000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Sydney
+X-LIC-LOCATION:Australia/Sydney
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+100452
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:19861019T020000
+RDATE:20000827T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Tasmania.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Tasmania.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Tasmania.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,146 +1,146 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Tasmania
-X-LIC-LOCATION:Australia/Tasmania
-BEGIN:STANDARD
-DTSTART:18950901T000000
-RDATE:18950901T000000
-TZNAME:EST
-TZOFFSETFROM:+094916
-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;BYDAY=1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Tasmania
+X-LIC-LOCATION:Australia/Tasmania
+BEGIN:STANDARD
+DTSTART:18950901T000000
+RDATE:18950901T000000
+TZNAME:EST
+TZOFFSETFROM:+094916
+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;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Victoria.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Victoria.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Victoria.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Victoria
-X-LIC-LOCATION:Australia/Victoria
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:EST
-TZOFFSETFROM:+093952
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19431003T020000
-RDATE:20000827T020000
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19711031T020000
-RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:EST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081005T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Victoria
+X-LIC-LOCATION:Australia/Victoria
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+093952
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19431003T020000
+RDATE:20000827T020000
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19711031T020000
+RRULE:FREQ=YEARLY;UNTIL=19851026T160000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T160000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19900317T160000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081005T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:+1000
+TZOFFSETTO:+1100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/West.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/West.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/West.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,62 +1,62 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/West
-X-LIC-LOCATION:Australia/West
-BEGIN:STANDARD
-DTSTART:18951201T000000
-RDATE:18951201T000000
-TZNAME:WST
-TZOFFSETFROM:+074324
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170101T000100
-RDATE:19170101T000100
-RDATE:19420101T020000
-RDATE:19420927T020000
-RDATE:19741027T020000
-RDATE:19831030T020000
-RDATE:19911117T020000
-RDATE:20061203T020000
-TZNAME:WST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19430328T020000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/West
+X-LIC-LOCATION:Australia/West
+BEGIN:STANDARD
+DTSTART:18951201T000000
+RDATE:18951201T000000
+TZNAME:WST
+TZOFFSETFROM:+074324
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170101T000100
+RDATE:19170101T000100
+RDATE:19420101T020000
+RDATE:19420927T020000
+RDATE:19741027T020000
+RDATE:19831030T020000
+RDATE:19911117T020000
+RDATE:20061203T020000
+TZNAME:WST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19430328T020000
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Australia/Yancowinna.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,151 +1,151 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Australia/Yancowinna
-X-LIC-LOCATION:Australia/Yancowinna
-BEGIN:STANDARD
-DTSTART:18950201T000000
-RDATE:18950201T000000
-TZNAME:EST
-TZOFFSETFROM:+092548
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18960823T000000
-RDATE:18960823T000000
-TZNAME:CST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170325T020000
-RDATE:19170325T020000
-RDATE:19420329T020000
-RDATE:19720227T030000
-RDATE:19820404T030000
-RDATE:20060402T030000
-RDATE:20070325T030000
-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
-BEGIN:STANDARD
-DTSTART:19710101T000000
-RDATE:19710101T000000
-TZNAME:CST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19730304T030000
-RRULE:FREQ=YEARLY;UNTIL=19810228T163000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19830306T030000
-RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19860316T030000
-RRULE:FREQ=YEARLY;UNTIL=19890318T163000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=19991030T163000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19900304T030000
-RRULE:FREQ=YEARLY;UNTIL=19950304T163000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960331T030000
-RRULE:FREQ=YEARLY;UNTIL=19990327T163000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:CST
-TZOFFSETFROM:+1030
-TZOFFSETTO:+0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20000101T000000
-RDATE:20000101T000000
-TZNAME:CST
-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
-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
-TZOFFSETFROM:+0930
-TZOFFSETTO:+1030
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Australia/Yancowinna
+X-LIC-LOCATION:Australia/Yancowinna
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:EST
+TZOFFSETFROM:+092548
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18960823T000000
+RDATE:18960823T000000
+TZNAME:CST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170325T020000
+RDATE:19170325T020000
+RDATE:19420329T020000
+RDATE:19720227T030000
+RDATE:19820404T030000
+RDATE:20060402T030000
+RDATE:20070325T030000
+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
+BEGIN:STANDARD
+DTSTART:19710101T000000
+RDATE:19710101T000000
+TZNAME:CST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19730304T030000
+RRULE:FREQ=YEARLY;UNTIL=19810228T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19830306T030000
+RRULE:FREQ=YEARLY;UNTIL=19850302T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860316T030000
+RRULE:FREQ=YEARLY;UNTIL=19890318T163000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=19991030T163000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900304T030000
+RRULE:FREQ=YEARLY;UNTIL=19950304T163000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960331T030000
+RRULE:FREQ=YEARLY;UNTIL=19990327T163000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CST
+TZOFFSETFROM:+1030
+TZOFFSETTO:+0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000101T000000
+RDATE:20000101T000000
+TZNAME:CST
+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
+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
+TZOFFSETFROM:+0930
+TZOFFSETTO:+1030
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/Acre.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/Acre.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/Acre.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,92 +1,92 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Brazil/Acre
-X-LIC-LOCATION:Brazil/Acre
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:ACST
-TZOFFSETFROM:-043112
-TZOFFSETTO:-0500
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
-TZNAME:ACT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19491201T000000
-RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
-TZNAME:ACST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19500416T010000
-RDATE:19500416T010000
-RDATE:19530301T000000
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-TZNAME:ACT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-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
-DTSTART:20080624T000000
-RDATE:20080624T000000
-TZNAME:AMT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Brazil/Acre
+X-LIC-LOCATION:Brazil/Acre
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:ACST
+TZOFFSETFROM:-043112
+TZOFFSETTO:-0500
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T040000Z;BYMONTH=4
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19491201T000000
+RRULE:FREQ=YEARLY;UNTIL=19521201T050000Z;BYMONTH=12
+TZNAME:ACST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19500416T010000
+RDATE:19500416T010000
+RDATE:19530301T000000
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+TZNAME:ACT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/DeNoronha.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,104 +1,104 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Brazil/DeNoronha
-X-LIC-LOCATION:Brazil/DeNoronha
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:FNST
-TZOFFSETFROM:-020940
-TZOFFSETTO:-0200
-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: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
-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
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:19890129T000000
-RDATE:19900211T000000
-RDATE:20000227T000000
-RDATE:20001015T000000
-RDATE:20020217T000000
-TZNAME:FNT
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-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
-TZNAME:FNST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Brazil/DeNoronha
+X-LIC-LOCATION:Brazil/DeNoronha
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:FNST
+TZOFFSETFROM:-020940
+TZOFFSETTO:-0200
+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: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
+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
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19890129T000000
+RDATE:19900211T000000
+RDATE:20000227T000000
+RDATE:20001015T000000
+RDATE:20020217T000000
+TZNAME:FNT
+TZOFFSETFROM:-0100
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/East.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,175 +1,175 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Brazil/East
-X-LIC-LOCATION:Brazil/East
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:BRST
-TZOFFSETFROM:-030628
-TZOFFSETTO:-0300
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-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
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19631023T000000
-RDATE:19631023T000000
-TZNAME:BRST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19640101T000000
-RDATE:19640101T000000
-TZNAME:BRST
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0200
-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=20060219T020000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20080217T000000
-RRULE:FREQ=YEARLY;UNTIL=20110220T020000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20081019T000000
-RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
-TZNAME:BRST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20130217T000000
-RRULE:FREQ=YEARLY;UNTIL=20140216T020000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20160221T000000
-RRULE:FREQ=YEARLY;UNTIL=20170219T020000Z;BYDAY=3SU;BYMONTH=2
-TZNAME:BRT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Brazil/East
+X-LIC-LOCATION:Brazil/East
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:BRST
+TZOFFSETFROM:-030628
+TZOFFSETTO:-0300
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T020000Z;BYMONTH=4
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+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
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19631023T000000
+RDATE:19631023T000000
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19640101T000000
+RDATE:19640101T000000
+TZNAME:BRST
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0200
+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=20060219T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20080217T000000
+RRULE:FREQ=YEARLY;UNTIL=20110220T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20081019T000000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=10
+TZNAME:BRST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20130217T000000
+RRULE:FREQ=YEARLY;UNTIL=20140216T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20160221T000000
+RRULE:FREQ=YEARLY;UNTIL=20170219T020000Z;BYDAY=3SU;BYMONTH=2
+TZNAME:BRT
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Brazil/West.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,95 +1,95 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Brazil/West
-X-LIC-LOCATION:Brazil/West
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:AMST
-TZOFFSETFROM:-040004
-TZOFFSETTO:-0400
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320401T000000
-RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-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
-RDATE:19640301T000000
-RDATE:19650331T000000
-RDATE:19860315T000000
-RDATE:19870214T000000
-RDATE:19880207T000000
-RDATE:19940220T000000
-TZNAME:AMT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-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: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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Brazil/West
+X-LIC-LOCATION:Brazil/West
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:AMST
+TZOFFSETFROM:-040004
+TZOFFSETTO:-0400
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320401T000000
+RRULE:FREQ=YEARLY;UNTIL=19330401T030000Z;BYMONTH=4
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+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
+RDATE:19640301T000000
+RDATE:19650331T000000
+RDATE:19860315T000000
+RDATE:19870214T000000
+RDATE:19880207T000000
+RDATE:19940220T000000
+TZNAME:AMT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+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: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/CET.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/CET.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/CET.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,87 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/CST6CDT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/CST6CDT.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/CST6CDT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Atlantic.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,221 +1,221 @@
-BEGIN:VCALENDAR
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19210905T000000
-RRULE:FREQ=YEARLY;UNTIL=19220905T030000Z;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19230506T000000
-RRULE:FREQ=YEARLY;UNTIL=19250503T040000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19280513T000000
-RRULE:FREQ=YEARLY;UNTIL=19310510T040000Z;BYDAY=2SU;BYMONTH=5
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19310928T000000
-RRULE:FREQ=YEARLY;UNTIL=19320926T030000Z;BYDAY=-1MO;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19370502T000000
-RRULE:FREQ=YEARLY;UNTIL=19380501T040000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19370927T000000
-RRULE:FREQ=YEARLY;UNTIL=19410929T030000Z;BYDAY=-1MO;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400505T000000
-RRULE:FREQ=YEARLY;UNTIL=19410504T040000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:AWT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T200000
-RDATE:19450814T200000
-TZNAME:APT
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19490424T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;UNTIL=19490925T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;UNTIL=19540425T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19540926T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19560429T020000
-RRULE:FREQ=YEARLY;UNTIL=19590426T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19560930T020000
-RRULE:FREQ=YEARLY;UNTIL=19590927T050000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19620429T020000
-RRULE:FREQ=YEARLY;UNTIL=19730429T060000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:AST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19741027T020000
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:20070311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:ADT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:AST
-TZOFFSETFROM:-0300
-TZOFFSETTO:-0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19210905T000000
+RRULE:FREQ=YEARLY;UNTIL=19220905T030000Z;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19230506T000000
+RRULE:FREQ=YEARLY;UNTIL=19250503T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19280513T000000
+RRULE:FREQ=YEARLY;UNTIL=19310510T040000Z;BYDAY=2SU;BYMONTH=5
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19310928T000000
+RRULE:FREQ=YEARLY;UNTIL=19320926T030000Z;BYDAY=-1MO;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19370502T000000
+RRULE:FREQ=YEARLY;UNTIL=19380501T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19370927T000000
+RRULE:FREQ=YEARLY;UNTIL=19410929T030000Z;BYDAY=-1MO;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400505T000000
+RRULE:FREQ=YEARLY;UNTIL=19410504T040000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:AWT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T200000
+RDATE:19450814T200000
+TZNAME:APT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19490424T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19490925T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19560429T020000
+RRULE:FREQ=YEARLY;UNTIL=19590426T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19560930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T050000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19620429T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T060000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:AST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19741027T020000
+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
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:ADT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:AST
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Central.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Central.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Central.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,129 +1,129 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;UNTIL=19600424T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19660424T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19661030T030000
-RRULE:FREQ=YEARLY;UNTIL=20051030T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;UNTIL=20050403T080000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20060101T000000
-RDATE:20060101T000000
-TZNAME:CST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19600424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19660424T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19661030T030000
+RRULE:FREQ=YEARLY;UNTIL=20051030T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20050403T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20060101T000000
+RDATE:20060101T000000
+TZNAME:CST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+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/Canada/East-Saskatchewan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/East-Saskatchewan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/East-Saskatchewan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,100 +1,100 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Canada/East-Saskatchewan
-X-LIC-LOCATION:Canada/East-Saskatchewan
-BEGIN:STANDARD
-DTSTART:19050901T000000
-RDATE:19050901T000000
-TZNAME:MST
-TZOFFSETFROM:-065836
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19460414T020000
-RDATE:19590426T020000
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19371010T000000
-RDATE:19381002T000000
-RDATE:19450930T020000
-RDATE:19461013T020000
-RDATE:19591025T020000
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19300504T000000
-RRULE:FREQ=YEARLY;UNTIL=19340506T070000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19301005T000000
-RRULE:FREQ=YEARLY;UNTIL=19341007T060000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19370411T000000
-RRULE:FREQ=YEARLY;UNTIL=19410413T070000Z;BYDAY=2SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19391008T000000
-RRULE:FREQ=YEARLY;UNTIL=19411012T060000Z;BYDAY=2SU;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:DAYLIGHT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;UNTIL=19570428T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Canada/East-Saskatchewan
+X-LIC-LOCATION:Canada/East-Saskatchewan
+BEGIN:STANDARD
+DTSTART:19050901T000000
+RDATE:19050901T000000
+TZNAME:MST
+TZOFFSETFROM:-065836
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19460414T020000
+RDATE:19590426T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19371010T000000
+RDATE:19381002T000000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19591025T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19300504T000000
+RRULE:FREQ=YEARLY;UNTIL=19340506T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19301005T000000
+RRULE:FREQ=YEARLY;UNTIL=19341007T060000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19370411T000000
+RRULE:FREQ=YEARLY;UNTIL=19410413T070000Z;BYDAY=2SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19391008T000000
+RRULE:FREQ=YEARLY;UNTIL=19411012T060000Z;BYDAY=2SU;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:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19570428T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Eastern.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,185 +1,185 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19220917T020000
-RRULE:FREQ=YEARLY;UNTIL=19260919T060000Z;BYDAY=3SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19240504T020000
-RRULE:FREQ=YEARLY;UNTIL=19270501T070000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19270925T020000
-RRULE:FREQ=YEARLY;UNTIL=19320925T060000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19470928T000000
-RRULE:FREQ=YEARLY;UNTIL=19480926T040000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19500430T020000
-RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19560930T060000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19571027T020000
-RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-DTSTART:19741027T020000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19220917T020000
+RRULE:FREQ=YEARLY;UNTIL=19260919T060000Z;BYDAY=3SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19240504T020000
+RRULE:FREQ=YEARLY;UNTIL=19270501T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19270925T020000
+RRULE:FREQ=YEARLY;UNTIL=19320925T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470928T000000
+RRULE:FREQ=YEARLY;UNTIL=19480926T040000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19500430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19560930T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19571027T020000
+RRULE:FREQ=YEARLY;UNTIL=19731028T060000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+DTSTART:19741027T020000
+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
+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/Canada/Mountain.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Mountain.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Mountain.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-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
-DTSTART:19180414T020000
-RRULE:FREQ=YEARLY;UNTIL=19190413T090000Z;BYDAY=2SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19200425T020000
-RRULE:FREQ=YEARLY;UNTIL=19230429T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;UNTIL=19230930T080000Z;BYDAY=-1SU;BYMONTH=9
-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:DAYLIGHT
-DTSTART:19470427T020000
-RDATE:19470427T020000
-RDATE:19670430T020000
-RDATE:19690427T020000
-TZNAME:MDT
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19721029T020000
-RRULE:FREQ=YEARLY;UNTIL=19861026T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19870101T000000
-RDATE:19870101T000000
-TZNAME:MST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+DTSTART:19180414T020000
+RRULE:FREQ=YEARLY;UNTIL=19190413T090000Z;BYDAY=2SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19200425T020000
+RRULE:FREQ=YEARLY;UNTIL=19230429T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;UNTIL=19230930T080000Z;BYDAY=-1SU;BYMONTH=9
+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:DAYLIGHT
+DTSTART:19470427T020000
+RDATE:19470427T020000
+RDATE:19670430T020000
+RDATE:19690427T020000
+TZNAME:MDT
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19721029T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870101T000000
+RDATE:19870101T000000
+TZNAME:MST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T090000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T080000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+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/Canada/Newfoundland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Newfoundland.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Newfoundland.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,189 +1,210 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170408T020000
-RDATE:19170408T020000
-RDATE:19180414T020000
-RDATE:19190505T230000
-TZNAME:NDT
-TZOFFSETFROM:-033052
-TZOFFSETTO:-023052
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19170917T020000
-RDATE:19170917T020000
-RDATE:19181031T020000
-RDATE:19190812T230000
-TZNAME:NST
-TZOFFSETFROM:-023052
-TZOFFSETTO:-033052
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19200502T230000
-RRULE:FREQ=YEARLY;UNTIL=19340507T023052Z;BYDAY=1SU;BYMONTH=5
-TZNAME:NDT
-TZOFFSETFROM:-033052
-TZOFFSETTO:-023052
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T230000
-RRULE:FREQ=YEARLY;UNTIL=19341029T013052Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19351027T230000
-RDATE:19351027T230000
-RDATE:19450930T020000
-RDATE:19871025T000100
-TZNAME:NST
-TZOFFSETFROM:-0230
-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
-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
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19450814T203000
-RDATE:19450814T203000
-TZNAME:NPT
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0230
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-TZNAME:NST
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510429T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T053000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:NDT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19510930T020000
-RRULE:FREQ=YEARLY;UNTIL=19590927T043000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19601030T020000
-RRULE:FREQ=YEARLY;UNTIL=19861026T043000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19880403T000100
-RDATE:19880403T000100
-TZNAME:NDDT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0130
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19881030T000100
-RDATE:19881030T000100
-TZNAME:NST
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19891029T000100
-RRULE:FREQ=YEARLY;UNTIL=20061029T023100Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20070311T000100
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:NDT
-TZOFFSETFROM:-0330
-TZOFFSETTO:-0230
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20071104T000100
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:NST
-TZOFFSETFROM:-0230
-TZOFFSETTO:-0330
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170408T020000
+RDATE:19170408T020000
+RDATE:19180414T020000
+RDATE:19190505T230000
+TZNAME:NDT
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19170917T020000
+RDATE:19170917T020000
+RDATE:19181031T020000
+RDATE:19190812T230000
+TZNAME:NST
+TZOFFSETFROM:-023052
+TZOFFSETTO:-033052
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19200502T230000
+RRULE:FREQ=YEARLY;UNTIL=19340507T023052Z;BYDAY=1SU;BYMONTH=5
+TZNAME:NDT
+TZOFFSETFROM:-033052
+TZOFFSETTO:-023052
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T230000
+RRULE:FREQ=YEARLY;UNTIL=19341029T013052Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19351027T230000
+RDATE:19351027T230000
+RDATE:19450930T020000
+RDATE:19871025T000100
+TZNAME:NST
+TZOFFSETFROM:-0230
+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
+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
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19450814T203000
+RDATE:19450814T203000
+TZNAME:NPT
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:NST
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510429T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T053000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19510930T020000
+RRULE:FREQ=YEARLY;UNTIL=19590927T043000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19601030T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T043000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19880403T000100
+RDATE:19880403T000100
+TZNAME:NDDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0130
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19881030T000100
+RDATE:19881030T000100
+TZNAME:NST
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19891029T000100
+RRULE:FREQ=YEARLY;UNTIL=20061029T023100Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T000100
+RRULE:FREQ=YEARLY;UNTIL=20110313T033100Z;BYDAY=2SU;BYMONTH=3
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T000100
+RRULE:FREQ=YEARLY;UNTIL=20101107T023100Z;BYDAY=1SU;BYMONTH=11
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111101T000000
+RDATE:20111101T000000
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0230
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111106T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:NST
+TZOFFSETFROM:-0230
+TZOFFSETTO:-0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20120311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:NDT
+TZOFFSETFROM:-0330
+TZOFFSETTO:-0230
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Pacific.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Pacific.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Pacific.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,102 +1,102 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19450930T020000
-RDATE:19461013T020000
-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:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;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
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;UNTIL=19861026T090000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19870101T000000
-RDATE:19870101T000000
-TZNAME:PST
-TZOFFSETFROM:-0800
-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:STANDARD
-DTSTART:19871025T020000
-RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19450930T020000
+RDATE:19461013T020000
+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:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;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
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19861026T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870101T000000
+RDATE:19870101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+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:STANDARD
+DTSTART:19871025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+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/Canada/Saskatchewan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Saskatchewan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Saskatchewan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,100 +1,100 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Canada/Saskatchewan
-X-LIC-LOCATION:Canada/Saskatchewan
-BEGIN:STANDARD
-DTSTART:19050901T000000
-RDATE:19050901T000000
-TZNAME:MST
-TZOFFSETFROM:-065836
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19460414T020000
-RDATE:19590426T020000
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19181031T020000
-RDATE:19181031T020000
-RDATE:19371010T000000
-RDATE:19381002T000000
-RDATE:19450930T020000
-RDATE:19461013T020000
-RDATE:19591025T020000
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19300504T000000
-RRULE:FREQ=YEARLY;UNTIL=19340506T070000Z;BYDAY=1SU;BYMONTH=5
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19301005T000000
-RRULE:FREQ=YEARLY;UNTIL=19341007T060000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19370411T000000
-RRULE:FREQ=YEARLY;UNTIL=19410413T070000Z;BYDAY=2SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19391008T000000
-RRULE:FREQ=YEARLY;UNTIL=19411012T060000Z;BYDAY=2SU;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:DAYLIGHT
-DTSTART:19470427T020000
-RRULE:FREQ=YEARLY;UNTIL=19570428T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Canada/Saskatchewan
+X-LIC-LOCATION:Canada/Saskatchewan
+BEGIN:STANDARD
+DTSTART:19050901T000000
+RDATE:19050901T000000
+TZNAME:MST
+TZOFFSETFROM:-065836
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19460414T020000
+RDATE:19590426T020000
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181031T020000
+RDATE:19181031T020000
+RDATE:19371010T000000
+RDATE:19381002T000000
+RDATE:19450930T020000
+RDATE:19461013T020000
+RDATE:19591025T020000
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19300504T000000
+RRULE:FREQ=YEARLY;UNTIL=19340506T070000Z;BYDAY=1SU;BYMONTH=5
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19301005T000000
+RRULE:FREQ=YEARLY;UNTIL=19341007T060000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19370411T000000
+RRULE:FREQ=YEARLY;UNTIL=19410413T070000Z;BYDAY=2SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19391008T000000
+RRULE:FREQ=YEARLY;UNTIL=19411012T060000Z;BYDAY=2SU;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:DAYLIGHT
+DTSTART:19470427T020000
+RRULE:FREQ=YEARLY;UNTIL=19570428T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Canada/Yukon.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,110 +1,110 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Canada/Yukon
-X-LIC-LOCATION:Canada/Yukon
-BEGIN:STANDARD
-DTSTART:19000820T000000
-RDATE:19000820T000000
-TZNAME:YST
-TZOFFSETFROM:-090012
-TZOFFSETTO:-0900
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180414T020000
-RDATE:19180414T020000
-RDATE:19190525T020000
-TZNAME:YDT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T150000
-RDATE:19450814T150000
-TZNAME:YPT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19650425T000000
-RDATE:19650425T000000
-TZNAME:YDDT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RDATE:19651031T020000
-TZNAME:YST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19660701T020000
-RDATE:19660701T020000
-TZNAME:PST
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0800
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Canada/Yukon
+X-LIC-LOCATION:Canada/Yukon
+BEGIN:STANDARD
+DTSTART:19000820T000000
+RDATE:19000820T000000
+TZNAME:YST
+TZOFFSETFROM:-090012
+TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180414T020000
+RDATE:19180414T020000
+RDATE:19190525T020000
+TZNAME:YDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T150000
+RDATE:19450814T150000
+TZNAME:YPT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19650425T000000
+RDATE:19650425T000000
+TZNAME:YDDT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RDATE:19651031T020000
+TZNAME:YST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660701T020000
+RDATE:19660701T020000
+TZNAME:PST
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0800
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/Continental.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,201 +1,211 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Chile/Continental
-X-LIC-LOCATION:Chile/Continental
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:SMT
-TZOFFSETFROM:-044246
-TZOFFSETTO:-044246
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19100101T000000
-RDATE:19100101T000000
-TZNAME:CLT
-TZOFFSETFROM:-044246
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19160701T000000
-RDATE:19160701T000000
-TZNAME:SMT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-044246
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180901T000000
-RDATE:19180901T000000
-TZNAME:CLT
-TZOFFSETFROM:-044246
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19190701T000000
-RDATE:19190701T000000
-TZNAME:SMT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-044246
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19270901T000000
-RDATE:19270901T000000
-TZNAME:CLST
-TZOFFSETFROM:-044246
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19280401T000000
-RRULE:FREQ=YEARLY;UNTIL=19320401T040000Z;BYMONTH=4
-TZNAME:CLT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460715T000000
-RDATE:19460715T000000
-TZNAME:CLST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19470331T230000
-RDATE:19470331T230000
-TZNAME:CLT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19470522T000000
-RDATE:19470522T000000
-TZNAME:CLST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19681103T000000
-RDATE:19681103T000000
-RDATE:19691123T000000
-RDATE:19730930T000000
-RDATE:19881002T000000
-RDATE:19891015T000000
-RDATE:19900916T000000
-RDATE:19980927T000000
-TZNAME:CLST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19690330T000000
-RDATE:19690330T000000
-RDATE:19700329T000000
-RDATE:19710314T000000
-RDATE:19870412T000000
-RDATE:19900318T000000
-RDATE:19970330T000000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Chile/Continental
+X-LIC-LOCATION:Chile/Continental
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:SMT
+TZOFFSETFROM:-044246
+TZOFFSETTO:-044246
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19100101T000000
+RDATE:19100101T000000
+TZNAME:CLT
+TZOFFSETFROM:-044246
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19160701T000000
+RDATE:19160701T000000
+TZNAME:SMT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-044246
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180901T000000
+RDATE:19180901T000000
+TZNAME:CLT
+TZOFFSETFROM:-044246
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19190701T000000
+RDATE:19190701T000000
+TZNAME:SMT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-044246
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19270901T000000
+RDATE:19270901T000000
+TZNAME:CLST
+TZOFFSETFROM:-044246
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19280401T000000
+RRULE:FREQ=YEARLY;UNTIL=19320401T040000Z;BYMONTH=4
+TZNAME:CLT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460715T000000
+RDATE:19460715T000000
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470331T230000
+RDATE:19470331T230000
+TZNAME:CLT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19470522T000000
+RDATE:19470522T000000
+TZNAME:CLST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19681103T000000
+RDATE:19681103T000000
+RDATE:19691123T000000
+RDATE:19730930T000000
+RDATE:19881002T000000
+RDATE:19891015T000000
+RDATE:19900916T000000
+RDATE:19980927T000000
+RDATE:20110821T000000
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19690330T000000
+RDATE:19690330T000000
+RDATE:19700329T000000
+RDATE:19710314T000000
+RDATE:19870412T000000
+RDATE:19900318T000000
+RDATE:19970330T000000
+RDATE:19980315T000000
+RDATE:19990404T000000
+RDATE:20080330T000000
+RDATE:20090315T000000
+RDATE:20100404T000000
+RDATE:20110508T000000
+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;UNTIL=20101010T040000Z;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:20120311T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=3
+TZNAME:CLT
+TZOFFSETFROM:-0300
+TZOFFSETTO:-0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20121014T000000
+RRULE:FREQ=YEARLY;BYDAY=SU;BYMONTHDAY=9,10,11,12,13,14,15;BYMONTH=10
+TZNAME:CLST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/EasterIsland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/EasterIsland.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Chile/EasterIsland.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,166 +1,185 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Chile/EasterIsland
-X-LIC-LOCATION:Chile/EasterIsland
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420531T220000
-RDATE:19420531T220000
-RDATE:19460831T210000
-RDATE:19690329T210000
-RDATE:19700328T210000
-RDATE:19710313T210000
-TZNAME:EAST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420731T220000
-RDATE:19420731T220000
-RDATE:19681102T210000
-RDATE:19691122T210000
-RDATE:19730929T210000
-TZNAME:EASST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460714T220000
-RDATE:19460714T220000
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19470331T210000
-RDATE:19470331T210000
-TZNAME:EAST
-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
-DTSTART:19720311T210000
-RRULE:FREQ=YEARLY;UNTIL=19810315T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-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
-DTSTART:19820313T210000
-RDATE:19820313T210000
-TZNAME:EAST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19821009T220000
-RRULE:FREQ=YEARLY;UNTIL=19871011T040000Z;BYDAY=2SA;BYMONTH=10
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830312T220000
-RRULE:FREQ=YEARLY;UNTIL=19860309T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19880312T220000
-RRULE:FREQ=YEARLY;UNTIL=19890312T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19881001T220000
-RDATE:19881001T220000
-RDATE:19891014T220000
-RDATE:19900915T220000
-RDATE:19980926T220000
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910309T220000
-RRULE:FREQ=YEARLY;UNTIL=19960310T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19911012T220000
-RRULE:FREQ=YEARLY;UNTIL=19971012T040000Z;BYDAY=2SA;BYMONTH=10
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19991009T220000
-RRULE:FREQ=YEARLY;BYDAY=2SA;BYMONTH=10
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20000311T220000
-RRULE:FREQ=YEARLY;UNTIL=20070311T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20110312T220000
-RRULE:FREQ=YEARLY;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Chile/EasterIsland
+X-LIC-LOCATION:Chile/EasterIsland
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420531T220000
+RDATE:19420531T220000
+RDATE:19460831T210000
+RDATE:19690329T210000
+RDATE:19700328T210000
+RDATE:19710313T210000
+TZNAME:EAST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420731T220000
+RDATE:19420731T220000
+RDATE:19681102T210000
+RDATE:19691122T210000
+RDATE:19730929T210000
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460714T220000
+RDATE:19460714T220000
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470331T210000
+RDATE:19470331T210000
+TZNAME:EAST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19701010T210000
+RRULE:FREQ=YEARLY;UNTIL=19721015T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19720311T210000
+RRULE:FREQ=YEARLY;UNTIL=19810315T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19741012T210000
+RRULE:FREQ=YEARLY;UNTIL=19811011T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19820313T210000
+RDATE:19820313T210000
+TZNAME:EAST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19821009T220000
+RRULE:FREQ=YEARLY;UNTIL=19871011T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830312T220000
+RRULE:FREQ=YEARLY;UNTIL=19860309T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870411T220000
+RDATE:19870411T220000
+RDATE:19900317T220000
+RDATE:19970329T220000
+RDATE:19980314T220000
+RDATE:19990403T220000
+RDATE:20080329T220000
+RDATE:20090314T220000
+RDATE:20100403T220000
+RDATE:20110507T220000
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19880312T220000
+RRULE:FREQ=YEARLY;UNTIL=19890312T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19881001T220000
+RDATE:19881001T220000
+RDATE:19891014T220000
+RDATE:19900915T220000
+RDATE:19980926T220000
+RDATE:20110820T220000
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910309T220000
+RRULE:FREQ=YEARLY;UNTIL=19960310T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19911012T220000
+RRULE:FREQ=YEARLY;UNTIL=19971012T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19991009T220000
+RRULE:FREQ=YEARLY;UNTIL=20101010T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20000311T220000
+RRULE:FREQ=YEARLY;UNTIL=20070311T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20120310T220000
+RRULE:FREQ=YEARLY;BYDAY=MO;BYYEARDAY=-275,-276,-277,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20121013T220000
+RRULE:FREQ=YEARLY;BYDAY=MO;BYYEARDAY=-61,-62,-63,-64,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Cuba.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Cuba.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Cuba.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,190 +1,198 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19281010T000000
-RDATE:19281010T000000
-RDATE:19650930T000000
-RDATE:19661002T000000
-RDATE:19961006T010000
-RDATE:19971012T010000
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400602T000000
-RRULE:FREQ=YEARLY;UNTIL=19420607T050000Z;BYDAY=1SU;BYMONTH=6
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19400901T000000
-RRULE:FREQ=YEARLY;UNTIL=19420906T040000Z;BYDAY=1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19670910T000000
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19691026T000000
-RRULE:FREQ=YEARLY;UNTIL=19711031T040000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19721008T000000
-RRULE:FREQ=YEARLY;UNTIL=19741008T040000Z;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19751026T000000
-RRULE:FREQ=YEARLY;UNTIL=19771030T040000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19781008T000000
-RRULE:FREQ=YEARLY;UNTIL=19901014T040000Z;BYDAY=2SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19790318T000000
-RRULE:FREQ=YEARLY;UNTIL=19800316T050000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19900401T000000
-RRULE:FREQ=YEARLY;UNTIL=19970406T050000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19911013T010000
-RRULE:FREQ=YEARLY;UNTIL=19951008T050000Z;BYDAY=2SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19980329T000000
-RRULE:FREQ=YEARLY;UNTIL=19990328T050000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19981025T010000
-RRULE:FREQ=YEARLY;UNTIL=20031026T050000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20000402T000000
-RRULE:FREQ=YEARLY;UNTIL=20040404T050000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20061029T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20090308T000000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:CDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+RDATE:20110320T000000
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19281010T000000
+RDATE:19281010T000000
+RDATE:19650930T000000
+RDATE:19661002T000000
+RDATE:19961006T010000
+RDATE:19971012T010000
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400602T000000
+RRULE:FREQ=YEARLY;UNTIL=19420607T050000Z;BYDAY=1SU;BYMONTH=6
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400901T000000
+RRULE:FREQ=YEARLY;UNTIL=19420906T040000Z;BYDAY=1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19670910T000000
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19691026T000000
+RRULE:FREQ=YEARLY;UNTIL=19711031T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19721008T000000
+RRULE:FREQ=YEARLY;UNTIL=19741008T040000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19751026T000000
+RRULE:FREQ=YEARLY;UNTIL=19771030T040000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19781008T000000
+RRULE:FREQ=YEARLY;UNTIL=19901014T040000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19790318T000000
+RRULE:FREQ=YEARLY;UNTIL=19800316T050000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+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
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19900401T000000
+RRULE:FREQ=YEARLY;UNTIL=19970406T050000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911013T010000
+RRULE:FREQ=YEARLY;UNTIL=19951008T050000Z;BYDAY=2SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19980329T000000
+RRULE:FREQ=YEARLY;UNTIL=19990328T050000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19981025T010000
+RRULE:FREQ=YEARLY;UNTIL=20031026T050000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000402T000000
+RRULE:FREQ=YEARLY;UNTIL=20040404T050000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20061029T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20090308T000000
+RRULE:FREQ=YEARLY;UNTIL=20100314T050000Z;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20120311T000000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/EET.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/EET.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/EET.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,52 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/EST.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/EST.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/EST.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/EST5EDT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/EST5EDT.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/EST5EDT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Egypt.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,123 +1,117 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19571001T000000
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19590930T030000
-RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19661001T030000
-RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19840501T010000
-RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z;BYMONTH=5
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19900501T010000
-RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z;BYMONTH=5
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19950428T000000
-RRULE:FREQ=YEARLY;BYDAY=-1FR;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19950929T000000
-RRULE:FREQ=YEARLY;UNTIL=20050929T210000Z;BYDAY=FR;BYYEARDAY=-92,-93,-94,-9
- 5,-96,-97,-98
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20101001T000000
-RRULE:FREQ=YEARLY;BYDAY=FR;BYYEARDAY=-92,-93,-94,-95,-96,-97,-98
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19401001T000000
+RDATE:19401001T000000
+RDATE:19410916T000000
+RDATE:19421027T000000
+RDATE:20060922T000000
+RDATE:20070907T000000
+RDATE:20080829T000000
+RDATE:20090821T000000
+RDATE:20100811T000000
+RDATE:20101001T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19571001T000000
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19590930T030000
+RRULE:FREQ=YEARLY;UNTIL=19650930T000000Z;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19661001T030000
+RRULE:FREQ=YEARLY;UNTIL=19941001T000000Z;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840501T010000
+RRULE:FREQ=YEARLY;UNTIL=19880430T230000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19900501T010000
+RRULE:FREQ=YEARLY;UNTIL=19940430T230000Z;BYMONTH=5
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19950428T000000
+RRULE:FREQ=YEARLY;UNTIL=20100429T220000Z;BYDAY=-1FR;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19950929T000000
+RRULE:FREQ=YEARLY;UNTIL=20050929T210000Z;BYDAY=FR;BYYEARDAY=-92,-93,-94,-9
+ 5,-96,-97,-98
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Eire.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Eire.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Eire.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,280 +1,280 @@
-BEGIN:VCALENDAR
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19221008T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
-TZNAME:GMT/IST
-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/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
-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
-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
-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;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
-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
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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:GMT/IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19681027T000000
-RDATE:19681027T000000
-TZNAME:IST
-TZOFFSETFROM:+0100
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
-TZNAME:GMT/IST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:GMT/IST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19221008T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+RDATE:19711031T030000
+TZNAME:GMT/IST
+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/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
+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
+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
+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;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
+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
+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
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
+TZNAME:IST
+TZOFFSETFROM:+0100
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+0.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+0.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+1.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+1.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+1.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+10.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+10.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+10.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+11.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+11.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+11.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+12.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+12.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+12.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+2.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+2.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+2.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+3.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+3.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+3.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+4.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+4.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+4.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+5.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+5.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+5.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+6.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+6.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+6.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+7.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+7.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+7.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+8.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+8.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+8.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+9.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+9.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT+9.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-0.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-0.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-1.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-1.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-1.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-10.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-10.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-10.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-11.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-11.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-11.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-12.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-12.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-12.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-13.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-13.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-13.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-14.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-14.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-14.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-2.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-2.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-2.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-3.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-3.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-3.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-4.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-4.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-4.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-5.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-5.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-5.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-6.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-6.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-6.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-7.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-7.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-7.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-8.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-8.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-8.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-9.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-9.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT-9.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT0.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/GMT0.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Greenwich.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Greenwich.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Greenwich.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UCT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UCT.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UCT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UTC.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UTC.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/UTC.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Universal.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Universal.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Universal.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Zulu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Zulu.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Etc/Zulu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Amsterdam.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,159 +1,159 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19260515T020000
-RRULE:FREQ=YEARLY;UNTIL=19310515T014028Z;BYMONTH=5
-TZNAME:NST
-TZOFFSETFROM:+001932
-TZOFFSETTO:+011932
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19330515T020000
-RRULE:FREQ=YEARLY;UNTIL=19360515T014028Z;BYMONTH=5
-TZNAME:NST
-TZOFFSETFROM:+001932
-TZOFFSETTO:+011932
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19380515T020000
-RRULE:FREQ=YEARLY;UNTIL=19390515T014000Z;BYMONTH=5
-TZNAME:NEST
-TZOFFSETFROM:+0020
-TZOFFSETTO:+0120
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19400516T000000
-RDATE:19400516T000000
-TZNAME:CEST
-TZOFFSETFROM:+0020
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
-RDATE:19770925T030000
-RDATE:19781001T030000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19430329T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19260515T020000
+RRULE:FREQ=YEARLY;UNTIL=19310515T014028Z;BYMONTH=5
+TZNAME:NST
+TZOFFSETFROM:+001932
+TZOFFSETTO:+011932
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19330515T020000
+RRULE:FREQ=YEARLY;UNTIL=19360515T014028Z;BYMONTH=5
+TZNAME:NST
+TZOFFSETFROM:+001932
+TZOFFSETTO:+011932
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19380515T020000
+RRULE:FREQ=YEARLY;UNTIL=19390515T014000Z;BYMONTH=5
+TZNAME:NEST
+TZOFFSETFROM:+0020
+TZOFFSETTO:+0120
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400516T000000
+RDATE:19400516T000000
+TZNAME:CEST
+TZOFFSETFROM:+0020
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+RDATE:19770925T030000
+RDATE:19781001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+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/Andorra.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Andorra.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Andorra.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19850929T030000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19850929T030000
+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/Athens.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Athens.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Athens.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,114 +1,114 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Athens
-X-LIC-LOCATION:Europe/Athens
-BEGIN:STANDARD
-DTSTART:18950914T000000
-RDATE:18950914T000000
-TZNAME:AMT
-TZOFFSETFROM:+013452
-TZOFFSETTO:+013452
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19160728T000100
-RDATE:19160728T000100
-TZNAME:EEST
-TZOFFSETFROM:+013452
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19320707T000000
-RDATE:19320707T000000
-RDATE:19410407T000000
-RDATE:19520701T000000
-RDATE:19750412T000000
-RDATE:19760411T020000
-RDATE:19790401T090000
-RDATE:19800401T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19320901T000000
-RDATE:19320901T000000
-RDATE:19521102T000000
-RDATE:19751126T010000
-RDATE:19761010T030000
-RDATE:19770926T030000
-RDATE:19780924T040000
-RDATE:19790929T020000
-RDATE:19800928T000000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410430T000000
-RDATE:19410430T000000
-TZNAME:CEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19440404T000000
-RDATE:19440404T000000
-TZNAME:EEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Athens
+X-LIC-LOCATION:Europe/Athens
+BEGIN:STANDARD
+DTSTART:18950914T000000
+RDATE:18950914T000000
+TZNAME:AMT
+TZOFFSETFROM:+013452
+TZOFFSETTO:+013452
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19160728T000100
+RDATE:19160728T000100
+TZNAME:EEST
+TZOFFSETFROM:+013452
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19320707T000000
+RDATE:19320707T000000
+RDATE:19410407T000000
+RDATE:19520701T000000
+RDATE:19750412T000000
+RDATE:19760411T020000
+RDATE:19790401T090000
+RDATE:19800401T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19320901T000000
+RDATE:19320901T000000
+RDATE:19521102T000000
+RDATE:19751126T010000
+RDATE:19761010T030000
+RDATE:19770926T030000
+RDATE:19780924T040000
+RDATE:19790929T020000
+RDATE:19800928T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410430T000000
+RDATE:19410430T000000
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19440404T000000
+RDATE:19440404T000000
+TZNAME:EEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belfast.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,291 +1,291 @@
-BEGIN:VCALENDAR
-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
-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:+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
-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
-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=19601002T020000Z;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: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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
-TZNAME:GMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960101T000000
-RDATE:19960101T000000
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:GMT/BST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:+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
+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
+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=19601002T020000Z;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: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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belgrade.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belgrade.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Belgrade.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,77 +1,77 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Belgrade
-X-LIC-LOCATION:Europe/Belgrade
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
-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:19450101T000000
-RDATE:19450101T000000
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821127T000000
-RDATE:19821127T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T030000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Belgrade
+X-LIC-LOCATION:Europe/Belgrade
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+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:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T030000
+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/Berlin.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Berlin.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Berlin.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,115 +1,115 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-X-LIC-LOCATION:Europe/Berlin
-BEGIN:STANDARD
-DTSTART:18930401T000000
-RDATE:18930401T000000
-TZNAME:CEST
-TZOFFSETFROM:+005328
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160430T230000
-RDATE:19160430T230000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19460414T020000
-RDATE:19470406T030000
-RDATE:19480418T020000
-RDATE:19490410T020000
-RDATE:19800406T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-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:+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
-DTSTART:19450924T030000
-RDATE:19450924T030000
-RDATE:19470629T030000
-TZNAME:CEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:STANDARD
+DTSTART:18930401T000000
+RDATE:18930401T000000
+TZNAME:CEST
+TZOFFSETFROM:+005328
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19460414T020000
+RDATE:19470406T030000
+RDATE:19480418T020000
+RDATE:19490410T020000
+RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+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:+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
+DTSTART:19450924T030000
+RDATE:19450924T030000
+RDATE:19470629T030000
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bratislava.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,111 +1,111 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Bratislava
-X-LIC-LOCATION:Europe/Bratislava
-BEGIN:STANDARD
-DTSTART:18500101T000000
-RDATE:18500101T000000
-TZNAME:PMT
-TZOFFSETFROM:+005744
-TZOFFSETTO:+005744
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18911001T000000
-RDATE:18911001T000000
-TZNAME:CEST
-TZOFFSETFROM:+005744
-TZOFFSETTO:+0100
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19451118T030000
-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:19440917T030000
-RDATE:19440917T030000
-TZNAME:CEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19461006T030000
-RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Bratislava
+X-LIC-LOCATION:Europe/Bratislava
+BEGIN:STANDARD
+DTSTART:18500101T000000
+RDATE:18500101T000000
+TZNAME:PMT
+TZOFFSETFROM:+005744
+TZOFFSETTO:+005744
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18911001T000000
+RDATE:18911001T000000
+TZNAME:CEST
+TZOFFSETFROM:+005744
+TZOFFSETTO:+0100
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19451118T030000
+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:19440917T030000
+RDATE:19440917T030000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19461006T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+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
+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/Brussels.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Brussels.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Brussels.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,179 +1,179 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Brussels
-X-LIC-LOCATION:Europe/Brussels
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:BMT
-TZOFFSETFROM:+001730
-TZOFFSETTO:+001730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18920501T120000
-RDATE:18920501T120000
-TZNAME:WET
-TZOFFSETFROM:+001730
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19141108T000000
-RDATE:19141108T000000
-TZNAME:CET
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19160501T000000
-RDATE:19160501T000000
-RDATE:19400520T030000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19440917T030000
-RDATE:19450916T030000
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19190301T230000
-RDATE:19190301T230000
-RDATE:19200214T230000
-RDATE:19210314T230000
-RDATE:19220325T230000
-RDATE:19230421T230000
-RDATE:19240329T230000
-RDATE:19250404T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290421T020000
-RDATE:19300413T020000
-RDATE:19310419T020000
-RDATE:19320403T020000
-RDATE:19330326T020000
-RDATE:19340408T020000
-RDATE:19350331T020000
-RDATE:19360419T020000
-RDATE:19370404T020000
-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
-DTSTART:19430329T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19460519T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19440903T000000
-RDATE:19440903T000000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Brussels
+X-LIC-LOCATION:Europe/Brussels
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:BMT
+TZOFFSETFROM:+001730
+TZOFFSETTO:+001730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18920501T120000
+RDATE:18920501T120000
+TZNAME:WET
+TZOFFSETFROM:+001730
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19141108T000000
+RDATE:19141108T000000
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19160501T000000
+RDATE:19160501T000000
+RDATE:19400520T030000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19440917T030000
+RDATE:19450916T030000
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19190301T230000
+RDATE:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19220325T230000
+RDATE:19230421T230000
+RDATE:19240329T230000
+RDATE:19250404T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290421T020000
+RDATE:19300413T020000
+RDATE:19310419T020000
+RDATE:19320403T020000
+RDATE:19330326T020000
+RDATE:19340408T020000
+RDATE:19350331T020000
+RDATE:19360419T020000
+RDATE:19370404T020000
+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;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+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
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460519T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19440903T000000
+RDATE:19440903T000000
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Bucharest.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,121 +1,121 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Bucharest
-X-LIC-LOCATION:Europe/Bucharest
-BEGIN:STANDARD
-DTSTART:18911001T000000
-RDATE:18911001T000000
-TZNAME:BMT
-TZOFFSETFROM:+014424
-TZOFFSETTO:+014424
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19310724T000000
-RDATE:19310724T000000
-TZNAME:EEST
-TZOFFSETFROM:+014424
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19320521T000000
-RDATE:19320521T000000
-RDATE:19790527T000000
-RDATE:19800405T230000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T000000
-RDATE:19790930T000000
-RDATE:19800928T010000
-RDATE:19961027T000000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;UNTIL=19900325T000000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19810927T030000
-RRULE:FREQ=YEARLY;UNTIL=19900930T000000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910929T010000
-RRULE:FREQ=YEARLY;UNTIL=19930925T220000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19940327T000000
-RRULE:FREQ=YEARLY;UNTIL=19960330T220000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19940925T000000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Bucharest
+X-LIC-LOCATION:Europe/Bucharest
+BEGIN:STANDARD
+DTSTART:18911001T000000
+RDATE:18911001T000000
+TZNAME:BMT
+TZOFFSETFROM:+014424
+TZOFFSETTO:+014424
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310724T000000
+RDATE:19310724T000000
+TZNAME:EEST
+TZOFFSETFROM:+014424
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19320521T000000
+RDATE:19320521T000000
+RDATE:19790527T000000
+RDATE:19800405T230000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T000000
+RDATE:19790930T000000
+RDATE:19800928T010000
+RDATE:19961027T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;UNTIL=19900325T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19810927T030000
+RRULE:FREQ=YEARLY;UNTIL=19900930T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910929T010000
+RRULE:FREQ=YEARLY;UNTIL=19930925T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19940327T000000
+RRULE:FREQ=YEARLY;UNTIL=19960330T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19940925T000000
+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/Budapest.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Budapest.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Budapest.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,118 +1,118 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Budapest
-X-LIC-LOCATION:Europe/Budapest
-BEGIN:STANDARD
-DTSTART:18901001T000000
-RDATE:18901001T000000
-TZNAME:CEST
-TZOFFSETFROM:+011620
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160430T230000
-RDATE:19160430T230000
-RDATE:19170416T020000
-RDATE:19180401T030000
-RDATE:19190415T030000
-RDATE:19200405T030000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450501T230000
-RDATE:19460331T020000
-RDATE:19500417T020000
-RDATE:19560603T000000
-RDATE:19570602T010000
-RDATE:19800406T010000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170917T030000
-RDATE:19180929T030000
-RDATE:19190915T030000
-RDATE:19200930T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451103T000000
-RDATE:19501023T030000
-RDATE:19560930T000000
-RDATE:19570929T030000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Budapest
+X-LIC-LOCATION:Europe/Budapest
+BEGIN:STANDARD
+DTSTART:18901001T000000
+RDATE:18901001T000000
+TZNAME:CEST
+TZOFFSETFROM:+011620
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19170416T020000
+RDATE:19180401T030000
+RDATE:19190415T030000
+RDATE:19200405T030000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450501T230000
+RDATE:19460331T020000
+RDATE:19500417T020000
+RDATE:19560603T000000
+RDATE:19570602T010000
+RDATE:19800406T010000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170917T030000
+RDATE:19180929T030000
+RDATE:19190915T030000
+RDATE:19200930T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451103T000000
+RDATE:19501023T030000
+RDATE:19560930T000000
+RDATE:19570929T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Chisinau.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,171 +1,171 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Chisinau
-X-LIC-LOCATION:Europe/Chisinau
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:CMT
-TZOFFSETFROM:+015520
-TZOFFSETTO:+0155
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180215T000000
-RDATE:19180215T000000
-TZNAME:BMT
-TZOFFSETFROM:+0155
-TZOFFSETTO:+014424
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19310724T000000
-RDATE:19310724T000000
-TZNAME:EEST
-TZOFFSETFROM:+014424
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19320521T000000
-RDATE:19320521T000000
-RDATE:19910331T020000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19400815T000000
-RDATE:19400815T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410717T000000
-RDATE:19410717T000000
-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:19440824T000000
-RDATE:19440824T000000
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Chisinau
+X-LIC-LOCATION:Europe/Chisinau
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:CMT
+TZOFFSETFROM:+015520
+TZOFFSETTO:+0155
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180215T000000
+RDATE:19180215T000000
+TZNAME:BMT
+TZOFFSETFROM:+0155
+TZOFFSETTO:+014424
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310724T000000
+RDATE:19310724T000000
+TZNAME:EEST
+TZOFFSETFROM:+014424
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19320521T000000
+RDATE:19320521T000000
+RDATE:19910331T020000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400815T000000
+RDATE:19400815T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410717T000000
+RDATE:19410717T000000
+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:19440824T000000
+RDATE:19440824T000000
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Copenhagen.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,80 +1,80 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Copenhagen
-X-LIC-LOCATION:Europe/Copenhagen
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:CMT
-TZOFFSETFROM:+005020
-TZOFFSETTO:+005020
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18940101T000000
-RDATE:18940101T000000
-TZNAME:CEST
-TZOFFSETFROM:+005020
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160514T230000
-RDATE:19160514T230000
-RDATE:19400515T000000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19460501T020000
-RDATE:19470504T020000
-RDATE:19480509T020000
-RDATE:19800406T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19160930T230000
-RDATE:19160930T230000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450815T030000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Copenhagen
+X-LIC-LOCATION:Europe/Copenhagen
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:CMT
+TZOFFSETFROM:+005020
+TZOFFSETTO:+005020
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18940101T000000
+RDATE:18940101T000000
+TZNAME:CEST
+TZOFFSETFROM:+005020
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160514T230000
+RDATE:19160514T230000
+RDATE:19400515T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460501T020000
+RDATE:19470504T020000
+RDATE:19480509T020000
+RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19160930T230000
+RDATE:19160930T230000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450815T030000
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Dublin.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,280 +1,280 @@
-BEGIN:VCALENDAR
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19221008T030000
-RDATE:19221008T030000
-RDATE:19391119T030000
-RDATE:19481031T030000
-RDATE:19491030T030000
-RDATE:19711031T030000
-TZNAME:GMT/IST
-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/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
-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
-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
-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;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
-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
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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:GMT/IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19681027T000000
-RDATE:19681027T000000
-TZNAME:IST
-TZOFFSETFROM:+0100
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
-TZNAME:GMT/IST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:GMT/IST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19221008T030000
+RDATE:19221008T030000
+RDATE:19391119T030000
+RDATE:19481031T030000
+RDATE:19491030T030000
+RDATE:19711031T030000
+TZNAME:GMT/IST
+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/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
+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
+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
+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;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
+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
+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
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19681027T000000
+RDATE:19681027T000000
+TZNAME:IST
+TZOFFSETFROM:+0100
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/IST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Gibraltar.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Gibraltar.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Gibraltar.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,219 +1,219 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Gibraltar
-X-LIC-LOCATION:Europe/Gibraltar
-BEGIN:STANDARD
-DTSTART:18800802T000000
-RDATE:18800802T000000
-TZNAME:S
-TZOFFSETFROM:-002124
-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
-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
-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:+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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Gibraltar
+X-LIC-LOCATION:Europe/Gibraltar
+BEGIN:STANDARD
+DTSTART:18800802T000000
+RDATE:18800802T000000
+TZNAME:S
+TZOFFSETFROM:-002124
+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
+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
+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:+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Guernsey.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,291 +1,291 @@
-BEGIN:VCALENDAR
-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
-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:+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
-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
-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=19601002T020000Z;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: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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
-TZNAME:GMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960101T000000
-RDATE:19960101T000000
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:GMT/BST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:+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
+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
+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=19601002T020000Z;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: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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Helsinki.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Helsinki.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Helsinki.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,79 +1,79 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19421003T000000
-RDATE:19421003T000000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19830101T000000
-RDATE:19830101T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830327T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T040000
-RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19421003T000000
+RDATE:19421003T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19830101T000000
+RDATE:19830101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830327T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T040000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+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/Isle_of_Man.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Isle_of_Man.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Isle_of_Man.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,291 +1,291 @@
-BEGIN:VCALENDAR
-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
-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:+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
-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
-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=19601002T020000Z;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: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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
-TZNAME:GMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960101T000000
-RDATE:19960101T000000
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:GMT/BST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:+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
+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
+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=19601002T020000Z;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: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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Istanbul.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Istanbul.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Istanbul.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,236 +1,264 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Istanbul
-X-LIC-LOCATION:Europe/Istanbul
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:IMT
-TZOFFSETFROM:+015552
-TZOFFSETTO:+015656
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19101001T000000
-RDATE:19101001T000000
-TZNAME:EEST
-TZOFFSETFROM:+015656
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160501T000000
-RDATE:19160501T000000
-RDATE:19200328T000000
-RDATE:19210403T000000
-RDATE:19220326T000000
-RDATE:19240513T000000
-RDATE:19250501T000000
-RDATE:19400630T000000
-RDATE:19401201T000000
-RDATE:19420401T000000
-RDATE:19450402T000000
-RDATE:19460601T000000
-RDATE:19490410T000000
-RDATE:19500419T000000
-RDATE:19510422T000000
-RDATE:19620715T000000
-RDATE:19640515T000000
-RDATE:19730603T010000
-RDATE:19740331T020000
-RDATE:19750330T000000
-RDATE:19760601T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T000000
-RDATE:19161001T000000
-RDATE:19201025T000000
-RDATE:19211003T000000
-RDATE:19221008T000000
-RDATE:19401005T000000
-RDATE:19410921T000000
-RDATE:19421101T000000
-RDATE:19451008T000000
-RDATE:19461001T000000
-RDATE:19511008T000000
-RDATE:19621008T000000
-RDATE:19641001T000000
-RDATE:19731104T030000
-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:+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
-TZNAME:TRST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19790401T030000
-RDATE:19790401T030000
-TZNAME:TRST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19791015T000000
-RRULE:FREQ=YEARLY;UNTIL=19821010T200000Z;BYDAY=-3MO;BYMONTH=10
-TZNAME:TRT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-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: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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Istanbul
+X-LIC-LOCATION:Europe/Istanbul
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:IMT
+TZOFFSETFROM:+015552
+TZOFFSETTO:+015656
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19101001T000000
+RDATE:19101001T000000
+TZNAME:EEST
+TZOFFSETFROM:+015656
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160501T000000
+RDATE:19160501T000000
+RDATE:19200328T000000
+RDATE:19210403T000000
+RDATE:19220326T000000
+RDATE:19240513T000000
+RDATE:19250501T000000
+RDATE:19400630T000000
+RDATE:19401201T000000
+RDATE:19420401T000000
+RDATE:19450402T000000
+RDATE:19460601T000000
+RDATE:19490410T000000
+RDATE:19500419T000000
+RDATE:19510422T000000
+RDATE:19620715T000000
+RDATE:19640515T000000
+RDATE:19730603T010000
+RDATE:19740331T020000
+RDATE:19750330T000000
+RDATE:19760601T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T000000
+RDATE:19161001T000000
+RDATE:19201025T000000
+RDATE:19211003T000000
+RDATE:19221008T000000
+RDATE:19401005T000000
+RDATE:19410921T000000
+RDATE:19421101T000000
+RDATE:19451008T000000
+RDATE:19461001T000000
+RDATE:19511008T000000
+RDATE:19621008T000000
+RDATE:19641001T000000
+RDATE:19731104T030000
+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:+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
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19790401T030000
+RDATE:19790401T030000
+TZNAME:TRST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19791015T000000
+RRULE:FREQ=YEARLY;UNTIL=19821010T200000Z;BYDAY=-3MO;BYMONTH=10
+TZNAME:TRT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+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: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
+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;UNTIL=20100328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071028T040000
+RRULE:FREQ=YEARLY;UNTIL=20101031T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T030000
+RDATE:20110327T030000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110328T030000
+RDATE:20110328T030000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111030T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20120325T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Jersey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Jersey.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Jersey.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,291 +1,291 @@
-BEGIN:VCALENDAR
-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
-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:+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
-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
-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=19601002T020000Z;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: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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
-TZNAME:GMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960101T000000
-RDATE:19960101T000000
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:GMT/BST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:+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
+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
+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=19601002T020000Z;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: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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kaliningrad.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kaliningrad.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kaliningrad.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,149 +1,156 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Kaliningrad
-X-LIC-LOCATION:Europe/Kaliningrad
-BEGIN:STANDARD
-DTSTART:18930401T000000
-RDATE:18930401T000000
-TZNAME:CEST
-TZOFFSETFROM:+0122
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160430T230000
-RDATE:19160430T230000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-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:19450101T000000
-RDATE:19450101T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19450429T000000
-RDATE:19450429T000000
-TZNAME:CEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19451101T000000
-RDATE:19451101T000000
-TZNAME:CET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Kaliningrad
+X-LIC-LOCATION:Europe/Kaliningrad
+BEGIN:STANDARD
+DTSTART:18930401T000000
+RDATE:18930401T000000
+TZNAME:CEST
+TZOFFSETFROM:+0122
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+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:19450101T000000
+RDATE:19450101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19450429T000000
+RDATE:19450429T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19451101T000000
+RDATE:19451101T000000
+TZNAME:CET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+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
+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
+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;UNTIL=20100328T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+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;UNTIL=20101031T000000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:FET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kiev.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kiev.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Kiev.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,138 +1,145 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Kiev
-X-LIC-LOCATION:Europe/Kiev
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:KMT
-TZOFFSETFROM:+020204
-TZOFFSETTO:+020204
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:EET
-TZOFFSETFROM:+020204
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300621T000000
-RDATE:19300621T000000
-TZNAME:MSK
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410920T000000
-RDATE:19410920T000000
-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
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19431106T000000
-RDATE:19431106T000000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0100
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900701T020000
-RDATE:19900701T020000
-RDATE:19950924T040000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Kiev
+X-LIC-LOCATION:Europe/Kiev
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:KMT
+TZOFFSETFROM:+020204
+TZOFFSETTO:+020204
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:EET
+TZOFFSETFROM:+020204
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410920T000000
+RDATE:19410920T000000
+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
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19431106T000000
+RDATE:19431106T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0100
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900701T020000
+RDATE:19900701T020000
+RDATE:19950924T040000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+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;UNTIL=20100328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T040000
+RRULE:FREQ=YEARLY;UNTIL=20101031T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T030000
+RDATE:20110327T030000
+TZNAME:FET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Lisbon.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Lisbon.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Lisbon.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,261 +1,262 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19401006T000000
-RRULE:FREQ=YEARLY;UNTIL=19411005T230000Z;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-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
-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
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19470406T020000
-RRULE:FREQ=YEARLY;UNTIL=19490403T020000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;UNTIL=19491002T020000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510401T020000
-RRULE:FREQ=YEARLY;UNTIL=19650404T020000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19511007T030000
-RRULE:FREQ=YEARLY;UNTIL=19651003T020000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19660403T020000
-RDATE:19660403T020000
-TZNAME:CET
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19760926T010000
-RDATE:19760926T010000
-TZNAME:WEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19780402T000000
-RRULE:FREQ=YEARLY;UNTIL=19790401T000000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;UNTIL=19820926T010000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19820328T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T020000
-RRULE:FREQ=YEARLY;UNTIL=19910929T010000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19840325T010000
-RRULE:FREQ=YEARLY;UNTIL=19920329T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920927T020000
-RDATE:19920927T020000
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END: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
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19970330T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291005T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;UNTIL=19321001T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;UNTIL=19381001T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411005T230000Z;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+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
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;UNTIL=19451027T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430829T000000
+RRULE:FREQ=YEARLY;UNTIL=19450825T220000Z;BYDAY=SU;BYYEARDAY=-122,-123,-124
+ ,-125,-126,-127,-128
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;UNTIL=19490403T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T020000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;UNTIL=19650404T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;UNTIL=19651003T020000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660403T020000
+RDATE:19660403T020000
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19760926T010000
+RDATE:19760926T010000
+TZNAME:WEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;UNTIL=19790401T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19820926T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19820328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T020000
+RRULE:FREQ=YEARLY;UNTIL=19910929T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;UNTIL=19920329T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920927T020000
+RDATE:19920927T020000
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END: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
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Ljubljana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Ljubljana.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Ljubljana.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,77 +1,77 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Ljubljana
-X-LIC-LOCATION:Europe/Ljubljana
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
-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:19450101T000000
-RDATE:19450101T000000
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821127T000000
-RDATE:19821127T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T030000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Ljubljana
+X-LIC-LOCATION:Europe/Ljubljana
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+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:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T030000
+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/London.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/London.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/London.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,291 +1,291 @@
-BEGIN:VCALENDAR
-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
-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:+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
-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
-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=19601002T020000Z;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: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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
-TZNAME:GMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960101T000000
-RDATE:19960101T000000
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:GMT/BST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:+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
+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
+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=19601002T020000Z;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: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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Luxembourg.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Luxembourg.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Luxembourg.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,168 +1,168 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Luxembourg
-X-LIC-LOCATION:Europe/Luxembourg
-BEGIN:STANDARD
-DTSTART:19040601T000000
-RDATE:19040601T000000
-TZNAME:CEST
-TZOFFSETFROM:+002436
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160514T230000
-RDATE:19160514T230000
-RDATE:19170428T230000
-RDATE:19180415T020000
-RDATE:19450402T020000
-RDATE:19460519T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170917T010000
-RDATE:19180916T030000
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19190301T230000
-RDATE:19190301T230000
-RDATE:19200214T230000
-RDATE:19210314T230000
-RDATE:19220325T230000
-RDATE:19230421T230000
-RDATE:19240329T230000
-RDATE:19250405T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19300413T020000
-RDATE:19310419T020000
-RDATE:19320403T020000
-RDATE:19330326T020000
-RDATE:19340408T020000
-RDATE:19350331T020000
-RDATE:19360419T020000
-RDATE:19370404T020000
-RDATE:19380327T020000
-RDATE:19390416T020000
-RDATE:19400225T020000
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19191005T030000
-RDATE:19191005T030000
-RDATE:19201024T020000
-RDATE:19211026T020000
-RDATE:19221008T010000
-RDATE:19231007T020000
-RDATE:19391119T030000
-TZNAME:WET
-TZOFFSETFROM:+0100
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Luxembourg
+X-LIC-LOCATION:Europe/Luxembourg
+BEGIN:STANDARD
+DTSTART:19040601T000000
+RDATE:19040601T000000
+TZNAME:CEST
+TZOFFSETFROM:+002436
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160514T230000
+RDATE:19160514T230000
+RDATE:19170428T230000
+RDATE:19180415T020000
+RDATE:19450402T020000
+RDATE:19460519T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170917T010000
+RDATE:19180916T030000
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19190301T230000
+RDATE:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19220325T230000
+RDATE:19230421T230000
+RDATE:19240329T230000
+RDATE:19250405T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19300413T020000
+RDATE:19310419T020000
+RDATE:19320403T020000
+RDATE:19330326T020000
+RDATE:19340408T020000
+RDATE:19350331T020000
+RDATE:19360419T020000
+RDATE:19370404T020000
+RDATE:19380327T020000
+RDATE:19390416T020000
+RDATE:19400225T020000
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19191005T030000
+RDATE:19191005T030000
+RDATE:19201024T020000
+RDATE:19211026T020000
+RDATE:19221008T010000
+RDATE:19231007T020000
+RDATE:19391119T030000
+TZNAME:WET
+TZOFFSETFROM:+0100
+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
+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/Madrid.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Madrid.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Madrid.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,176 +1,176 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420502T230000
-RDATE:19420502T230000
-TZNAME:WEMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19460930T000000
-RDATE:19460930T000000
-TZNAME:CEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19490430T230000
-RDATE:19490430T230000
-RDATE:19760327T230000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19490930T010000
-RDATE:19490930T010000
-RDATE:19781001T010000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19741006T010000
-RRULE:FREQ=YEARLY;UNTIL=19751004T230000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19760926T010000
-RRULE:FREQ=YEARLY;UNTIL=19770924T230000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-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:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19790401T020000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291005T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19371003T000000
+RRULE:FREQ=YEARLY;UNTIL=19391007T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420502T230000
+RDATE:19420502T230000
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460930T000000
+RDATE:19460930T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19490430T230000
+RDATE:19490430T230000
+RDATE:19760327T230000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19490930T010000
+RDATE:19490930T010000
+RDATE:19781001T010000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19741006T010000
+RRULE:FREQ=YEARLY;UNTIL=19751004T230000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19760926T010000
+RRULE:FREQ=YEARLY;UNTIL=19770924T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+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:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19790401T020000
+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/Malta.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Malta.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Malta.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,130 +1,130 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Malta
-X-LIC-LOCATION:Europe/Malta
-BEGIN:STANDARD
-DTSTART:18931102T000000
-RDATE:18931102T000000
-TZNAME:CEST
-TZOFFSETFROM:+005804
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160603T000000
-RDATE:19160603T000000
-RDATE:19170401T000000
-RDATE:19180310T000000
-RDATE:19190302T000000
-RDATE:19200321T000000
-RDATE:19400615T000000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19460317T020000
-RDATE:19470316T000000
-RDATE:19480229T020000
-RDATE:19690601T000000
-RDATE:19700531T000000
-RDATE:19730331T000000
-RDATE:19740421T000000
-RDATE:19800331T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170930T010000
-RDATE:19200919T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450915T010000
-RDATE:19461006T030000
-RDATE:19471005T010000
-RDATE:19481003T030000
-RDATE:19700927T000000
-RDATE:19710926T010000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Malta
+X-LIC-LOCATION:Europe/Malta
+BEGIN:STANDARD
+DTSTART:18931102T000000
+RDATE:18931102T000000
+TZNAME:CEST
+TZOFFSETFROM:+005804
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160603T000000
+RDATE:19160603T000000
+RDATE:19170401T000000
+RDATE:19180310T000000
+RDATE:19190302T000000
+RDATE:19200321T000000
+RDATE:19400615T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460317T020000
+RDATE:19470316T000000
+RDATE:19480229T020000
+RDATE:19690601T000000
+RDATE:19700531T000000
+RDATE:19730331T000000
+RDATE:19740421T000000
+RDATE:19800331T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170930T010000
+RDATE:19200919T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450915T010000
+RDATE:19461006T030000
+RDATE:19471005T010000
+RDATE:19481003T030000
+RDATE:19700927T000000
+RDATE:19710926T010000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Mariehamn.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,79 +1,79 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19421003T000000
-RDATE:19421003T000000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19830101T000000
-RDATE:19830101T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830327T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T040000
-RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19421003T000000
+RDATE:19421003T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19830101T000000
+RDATE:19830101T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830327T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T040000
+RRULE:FREQ=YEARLY;UNTIL=19950924T010000Z;BYDAY=-1SU;BYMONTH=9
+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/Minsk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Minsk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Minsk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,144 +1,151 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Minsk
-X-LIC-LOCATION:Europe/Minsk
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:MMT
-TZOFFSETFROM:+015016
-TZOFFSETTO:+0150
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:EET
-TZOFFSETFROM:+0150
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300621T000000
-RDATE:19300621T000000
-TZNAME:MSK
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410628T000000
-RDATE:19410628T000000
-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: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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-TZNAME:EEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910929T030000
-RDATE:19910929T030000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Minsk
+X-LIC-LOCATION:Europe/Minsk
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
+TZOFFSETFROM:+015016
+TZOFFSETTO:+0150
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:EET
+TZOFFSETFROM:+0150
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410628T000000
+RDATE:19410628T000000
+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: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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910929T030000
+RDATE:19910929T030000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+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;UNTIL=20100328T000000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+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;UNTIL=20101031T000000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:FET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Monaco.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Monaco.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Monaco.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,158 +1,158 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Monaco
-X-LIC-LOCATION:Europe/Monaco
-BEGIN:STANDARD
-DTSTART:18910315T000000
-RDATE:18910315T000000
-TZNAME:PMT
-TZOFFSETFROM:+002932
-TZOFFSETTO:+000921
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110311T000000
-RDATE:19110311T000000
-TZNAME:WEST
-TZOFFSETFROM:+000921
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160614T230000
-RDATE:19160614T230000
-RDATE:19170324T230000
-RDATE:19180309T230000
-RDATE:19190301T230000
-RDATE:19200214T230000
-RDATE:19210314T230000
-RDATE:19220325T230000
-RDATE:19230526T230000
-RDATE:19240329T230000
-RDATE:19250404T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19300412T230000
-RDATE:19310418T230000
-RDATE:19320402T230000
-RDATE:19330325T230000
-RDATE:19340407T230000
-RDATE:19350330T230000
-RDATE:19360418T230000
-RDATE:19370403T230000
-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
-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
-DTSTART:19410505T000000
-RDATE:19410505T000000
-RDATE:19420309T000000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-TZNAME:WEMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Monaco
+X-LIC-LOCATION:Europe/Monaco
+BEGIN:STANDARD
+DTSTART:18910315T000000
+RDATE:18910315T000000
+TZNAME:PMT
+TZOFFSETFROM:+002932
+TZOFFSETTO:+000921
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110311T000000
+RDATE:19110311T000000
+TZNAME:WEST
+TZOFFSETFROM:+000921
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160614T230000
+RDATE:19160614T230000
+RDATE:19170324T230000
+RDATE:19180309T230000
+RDATE:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19220325T230000
+RDATE:19230526T230000
+RDATE:19240329T230000
+RDATE:19250404T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19300412T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19330325T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+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
+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;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19410505T000000
+RDATE:19410505T000000
+RDATE:19420309T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+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
+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
+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/Moscow.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Moscow.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Moscow.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,168 +1,175 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Moscow
-X-LIC-LOCATION:Europe/Moscow
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:MMT
-TZOFFSETFROM:+023020
-TZOFFSETTO:+0230
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19160703T000000
-RDATE:19160703T000000
-TZNAME:S
-TZOFFSETFROM:+0230
-TZOFFSETTO:+023048
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170701T230000
-RDATE:19170701T230000
-TZNAME:MST
-TZOFFSETFROM:+023048
-TZOFFSETTO:+033048
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19171228T000000
-RDATE:19171228T000000
-TZNAME:MMT
-TZOFFSETFROM:+033048
-TZOFFSETTO:+023048
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180531T220000
-RDATE:19180531T220000
-TZNAME:MDST
-TZOFFSETFROM:+023048
-TZOFFSETTO:+043048
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19180916T010000
-RDATE:19180916T010000
-TZNAME:MST
-TZOFFSETFROM:+043048
-TZOFFSETTO:+033048
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19190531T230000
-RDATE:19190531T230000
-TZNAME:MDST
-TZOFFSETFROM:+033048
-TZOFFSETTO:+043048
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19190701T020000
-RDATE:19190701T020000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+043048
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19190816T000000
-RDATE:19190816T000000
-RDATE:19211001T000000
-RDATE:19920926T230000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19210901T000000
-RDATE:19210901T000000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19221001T000000
-RDATE:19221001T000000
-RDATE:19910929T030000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Moscow
+X-LIC-LOCATION:Europe/Moscow
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
+TZOFFSETFROM:+023020
+TZOFFSETTO:+0230
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19160703T000000
+RDATE:19160703T000000
+TZNAME:S
+TZOFFSETFROM:+0230
+TZOFFSETTO:+023048
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170701T230000
+RDATE:19170701T230000
+TZNAME:MST
+TZOFFSETFROM:+023048
+TZOFFSETTO:+033048
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19171228T000000
+RDATE:19171228T000000
+TZNAME:MMT
+TZOFFSETFROM:+033048
+TZOFFSETTO:+023048
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180531T220000
+RDATE:19180531T220000
+TZNAME:MDST
+TZOFFSETFROM:+023048
+TZOFFSETTO:+043048
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19180916T010000
+RDATE:19180916T010000
+TZNAME:MST
+TZOFFSETFROM:+043048
+TZOFFSETTO:+033048
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19190531T230000
+RDATE:19190531T230000
+TZNAME:MDST
+TZOFFSETFROM:+033048
+TZOFFSETTO:+043048
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19190701T020000
+RDATE:19190701T020000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+043048
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19190816T000000
+RDATE:19190816T000000
+RDATE:19211001T000000
+RDATE:19920926T230000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19210901T000000
+RDATE:19210901T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19221001T000000
+RDATE:19221001T000000
+RDATE:19910929T030000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+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
+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;UNTIL=20100327T230000Z;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;UNTIL=20101030T230000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Nicosia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Nicosia.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Nicosia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,76 +1,76 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Nicosia
-X-LIC-LOCATION:Europe/Nicosia
-BEGIN:STANDARD
-DTSTART:19211114T000000
-RDATE:19211114T000000
-TZNAME:EEST
-TZOFFSETFROM:+021328
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19750413T000000
-RDATE:19750413T000000
-RDATE:19760515T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19751012T000000
-RDATE:19751012T000000
-RDATE:19761011T000000
-RDATE:19770925T000000
-RDATE:19781002T000000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19770403T000000
-RRULE:FREQ=YEARLY;UNTIL=19800405T220000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T000000
-RRULE:FREQ=YEARLY;UNTIL=19970927T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T000000
-RRULE:FREQ=YEARLY;UNTIL=19980328T220000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990328T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Nicosia
+X-LIC-LOCATION:Europe/Nicosia
+BEGIN:STANDARD
+DTSTART:19211114T000000
+RDATE:19211114T000000
+TZNAME:EEST
+TZOFFSETFROM:+021328
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19750413T000000
+RDATE:19750413T000000
+RDATE:19760515T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19751012T000000
+RDATE:19751012T000000
+RDATE:19761011T000000
+RDATE:19770925T000000
+RDATE:19781002T000000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T000000
+RRULE:FREQ=YEARLY;UNTIL=19800405T220000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T000000
+RRULE:FREQ=YEARLY;UNTIL=19970927T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T000000
+RRULE:FREQ=YEARLY;UNTIL=19980328T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19990328T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Oslo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Oslo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Oslo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,88 +1,88 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19160930T000000
-RDATE:19160930T000000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451001T030000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19590920T030000
-RRULE:FREQ=YEARLY;UNTIL=19650919T010000Z;BYDAY=3SU;BYMONTH=9
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19160930T000000
+RDATE:19160930T000000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19451001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19590920T030000
+RRULE:FREQ=YEARLY;UNTIL=19650919T010000Z;BYDAY=3SU;BYMONTH=9
+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
+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/Paris.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Paris.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Paris.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,169 +1,169 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Paris
-X-LIC-LOCATION:Europe/Paris
-BEGIN:STANDARD
-DTSTART:18910315T000100
-RDATE:18910315T000100
-TZNAME:PMT
-TZOFFSETFROM:+000921
-TZOFFSETTO:+000921
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19110311T000100
-RDATE:19110311T000100
-TZNAME:WEST
-TZOFFSETFROM:+000921
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160614T230000
-RDATE:19160614T230000
-RDATE:19170324T230000
-RDATE:19180309T230000
-RDATE:19190301T230000
-RDATE:19200214T230000
-RDATE:19210314T230000
-RDATE:19220325T230000
-RDATE:19230526T230000
-RDATE:19240329T230000
-RDATE:19250404T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19300412T230000
-RDATE:19310418T230000
-RDATE:19320402T230000
-RDATE:19330325T230000
-RDATE:19340407T230000
-RDATE:19350330T230000
-RDATE:19360418T230000
-RDATE:19370403T230000
-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
-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:STANDARD
-DTSTART:19400614T230000
-RDATE:19400614T230000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19760926T010000
-RDATE:19770925T030000
-RDATE:19781001T030000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19430329T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19760328T010000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19440825T000000
-RDATE:19440825T000000
-TZNAME:WEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19441008T010000
-RDATE:19441008T010000
-TZNAME:WEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450402T020000
-RDATE:19450402T020000
-TZNAME:WEMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450916T030000
-RDATE:19450916T030000
-TZNAME:CEST
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Paris
+X-LIC-LOCATION:Europe/Paris
+BEGIN:STANDARD
+DTSTART:18910315T000100
+RDATE:18910315T000100
+TZNAME:PMT
+TZOFFSETFROM:+000921
+TZOFFSETTO:+000921
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19110311T000100
+RDATE:19110311T000100
+TZNAME:WEST
+TZOFFSETFROM:+000921
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160614T230000
+RDATE:19160614T230000
+RDATE:19170324T230000
+RDATE:19180309T230000
+RDATE:19190301T230000
+RDATE:19200214T230000
+RDATE:19210314T230000
+RDATE:19220325T230000
+RDATE:19230526T230000
+RDATE:19240329T230000
+RDATE:19250404T230000
+RDATE:19260417T230000
+RDATE:19270409T230000
+RDATE:19280414T230000
+RDATE:19290420T230000
+RDATE:19300412T230000
+RDATE:19310418T230000
+RDATE:19320402T230000
+RDATE:19330325T230000
+RDATE:19340407T230000
+RDATE:19350330T230000
+RDATE:19360418T230000
+RDATE:19370403T230000
+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
+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;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400614T230000
+RDATE:19400614T230000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19760926T010000
+RDATE:19770925T030000
+RDATE:19781001T030000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19760328T010000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19440825T000000
+RDATE:19440825T000000
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19441008T010000
+RDATE:19441008T010000
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450402T020000
+RDATE:19450402T020000
+TZNAME:WEMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450916T030000
+RDATE:19450916T030000
+TZNAME:CEST
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Podgorica.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,77 +1,77 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Podgorica
-X-LIC-LOCATION:Europe/Podgorica
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
-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:19450101T000000
-RDATE:19450101T000000
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821127T000000
-RDATE:19821127T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T030000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Podgorica
+X-LIC-LOCATION:Europe/Podgorica
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+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:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T030000
+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/Prague.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Prague.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Prague.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,111 +1,111 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Prague
-X-LIC-LOCATION:Europe/Prague
-BEGIN:STANDARD
-DTSTART:18500101T000000
-RDATE:18500101T000000
-TZNAME:PMT
-TZOFFSETFROM:+005744
-TZOFFSETTO:+005744
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18911001T000000
-RDATE:18911001T000000
-TZNAME:CEST
-TZOFFSETFROM:+005744
-TZOFFSETTO:+0100
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19451118T030000
-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:19440917T030000
-RDATE:19440917T030000
-TZNAME:CEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19461006T030000
-RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Prague
+X-LIC-LOCATION:Europe/Prague
+BEGIN:STANDARD
+DTSTART:18500101T000000
+RDATE:18500101T000000
+TZNAME:PMT
+TZOFFSETFROM:+005744
+TZOFFSETTO:+005744
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18911001T000000
+RDATE:18911001T000000
+TZNAME:CEST
+TZOFFSETFROM:+005744
+TZOFFSETTO:+0100
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19451118T030000
+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:19440917T030000
+RDATE:19440917T030000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19461006T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T010000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+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
+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/Riga.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Riga.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Riga.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,169 +1,169 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Riga
-X-LIC-LOCATION:Europe/Riga
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:RMT
-TZOFFSETFROM:+013624
-TZOFFSETTO:+013624
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180415T020000
-RDATE:19180415T020000
-RDATE:19190401T020000
-TZNAME:LST
-TZOFFSETFROM:+013624
-TZOFFSETTO:+023624
-END:STANDARD
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19400805T000000
-RDATE:19400805T000000
-TZNAME:MSK
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410701T000000
-RDATE:19410701T000000
-TZNAME:CEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-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:19441013T000000
-RDATE:19441013T000000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0100
-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
-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
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20000229T000000
-RDATE:20000229T000000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Riga
+X-LIC-LOCATION:Europe/Riga
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:RMT
+TZOFFSETFROM:+013624
+TZOFFSETTO:+013624
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180415T020000
+RDATE:19180415T020000
+RDATE:19190401T020000
+TZNAME:LST
+TZOFFSETFROM:+013624
+TZOFFSETTO:+023624
+END:STANDARD
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400805T000000
+RDATE:19400805T000000
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410701T000000
+RDATE:19410701T000000
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+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:19441013T000000
+RDATE:19441013T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0100
+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
+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
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20000229T000000
+RDATE:20000229T000000
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Rome.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,153 +1,153 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Rome
-X-LIC-LOCATION:Europe/Rome
-BEGIN:STANDARD
-DTSTART:18660922T000000
-RDATE:18660922T000000
-TZNAME:RMT
-TZOFFSETFROM:+004956
-TZOFFSETTO:+004956
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18931101T000000
-RDATE:18931101T000000
-TZNAME:CEST
-TZOFFSETFROM:+004956
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160603T000000
-RDATE:19160603T000000
-RDATE:19170401T000000
-RDATE:19180310T000000
-RDATE:19190302T000000
-RDATE:19200321T000000
-RDATE:19400615T000000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19460317T020000
-RDATE:19470316T000000
-RDATE:19480229T020000
-RDATE:19690601T000000
-RDATE:19700531T000000
-RDATE:19730603T000000
-RDATE:19740526T000000
-RDATE:19750601T000000
-RDATE:19760530T000000
-RDATE:19800406T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170930T010000
-RDATE:19200919T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19440917T010000
-RDATE:19450915T010000
-RDATE:19461006T030000
-RDATE:19471005T010000
-RDATE:19481003T030000
-RDATE:19700927T000000
-RDATE:19710926T010000
-RDATE:19721001T000000
-RDATE:19781001T010000
-RDATE:19790930T010000
-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: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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Rome
+X-LIC-LOCATION:Europe/Rome
+BEGIN:STANDARD
+DTSTART:18660922T000000
+RDATE:18660922T000000
+TZNAME:RMT
+TZOFFSETFROM:+004956
+TZOFFSETTO:+004956
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18931101T000000
+RDATE:18931101T000000
+TZNAME:CEST
+TZOFFSETFROM:+004956
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160603T000000
+RDATE:19160603T000000
+RDATE:19170401T000000
+RDATE:19180310T000000
+RDATE:19190302T000000
+RDATE:19200321T000000
+RDATE:19400615T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460317T020000
+RDATE:19470316T000000
+RDATE:19480229T020000
+RDATE:19690601T000000
+RDATE:19700531T000000
+RDATE:19730603T000000
+RDATE:19740526T000000
+RDATE:19750601T000000
+RDATE:19760530T000000
+RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170930T010000
+RDATE:19200919T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19440917T010000
+RDATE:19450915T010000
+RDATE:19461006T030000
+RDATE:19471005T010000
+RDATE:19481003T030000
+RDATE:19700927T000000
+RDATE:19710926T010000
+RDATE:19721001T000000
+RDATE:19781001T010000
+RDATE:19790930T010000
+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: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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Samara.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,150 +1,144 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
-TZNAME:KUYT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19880924T220000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:KUYT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19880326T220000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:KUYST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:SAMT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;UNTIL=20091024T220000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:SAMT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20100328T020000
-RDATE:20100328T020000
-TZNAME:SAMST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20101031T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:SAMT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20110327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:SAMST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+RDATE:20110327T020000
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:KUYT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19880924T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:KUYT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19880326T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:KUYST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:SAMT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20091024T220000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:SAMT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100328T020000
+RDATE:20100328T020000
+TZNAME:SAMST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20101031T030000
+RDATE:20101031T030000
+TZNAME:SAMT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/San_Marino.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/San_Marino.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/San_Marino.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,153 +1,153 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/San_Marino
-X-LIC-LOCATION:Europe/San_Marino
-BEGIN:STANDARD
-DTSTART:18660922T000000
-RDATE:18660922T000000
-TZNAME:RMT
-TZOFFSETFROM:+004956
-TZOFFSETTO:+004956
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18931101T000000
-RDATE:18931101T000000
-TZNAME:CEST
-TZOFFSETFROM:+004956
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160603T000000
-RDATE:19160603T000000
-RDATE:19170401T000000
-RDATE:19180310T000000
-RDATE:19190302T000000
-RDATE:19200321T000000
-RDATE:19400615T000000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19460317T020000
-RDATE:19470316T000000
-RDATE:19480229T020000
-RDATE:19690601T000000
-RDATE:19700531T000000
-RDATE:19730603T000000
-RDATE:19740526T000000
-RDATE:19750601T000000
-RDATE:19760530T000000
-RDATE:19800406T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170930T010000
-RDATE:19200919T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19440917T010000
-RDATE:19450915T010000
-RDATE:19461006T030000
-RDATE:19471005T010000
-RDATE:19481003T030000
-RDATE:19700927T000000
-RDATE:19710926T010000
-RDATE:19721001T000000
-RDATE:19781001T010000
-RDATE:19790930T010000
-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: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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/San_Marino
+X-LIC-LOCATION:Europe/San_Marino
+BEGIN:STANDARD
+DTSTART:18660922T000000
+RDATE:18660922T000000
+TZNAME:RMT
+TZOFFSETFROM:+004956
+TZOFFSETTO:+004956
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18931101T000000
+RDATE:18931101T000000
+TZNAME:CEST
+TZOFFSETFROM:+004956
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160603T000000
+RDATE:19160603T000000
+RDATE:19170401T000000
+RDATE:19180310T000000
+RDATE:19190302T000000
+RDATE:19200321T000000
+RDATE:19400615T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460317T020000
+RDATE:19470316T000000
+RDATE:19480229T020000
+RDATE:19690601T000000
+RDATE:19700531T000000
+RDATE:19730603T000000
+RDATE:19740526T000000
+RDATE:19750601T000000
+RDATE:19760530T000000
+RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170930T010000
+RDATE:19200919T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19440917T010000
+RDATE:19450915T010000
+RDATE:19461006T030000
+RDATE:19471005T010000
+RDATE:19481003T030000
+RDATE:19700927T000000
+RDATE:19710926T010000
+RDATE:19721001T000000
+RDATE:19781001T010000
+RDATE:19790930T010000
+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: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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sarajevo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,77 +1,77 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Sarajevo
-X-LIC-LOCATION:Europe/Sarajevo
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
-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:19450101T000000
-RDATE:19450101T000000
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821127T000000
-RDATE:19821127T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T030000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Sarajevo
+X-LIC-LOCATION:Europe/Sarajevo
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+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:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T030000
+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/Simferopol.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Simferopol.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Simferopol.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,180 +1,187 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Simferopol
-X-LIC-LOCATION:Europe/Simferopol
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-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
-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:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19900101T000000
-RDATE:19900101T000000
-RDATE:19970101T000000
-TZNAME:MSK
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900701T020000
-RDATE:19900701T020000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920101T000000
-RDATE:19920101T000000
-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=19930925T210000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19940501T000000
-RDATE:19940501T000000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-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
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961027T040000
-RDATE:19961027T040000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Simferopol
+X-LIC-LOCATION:Europe/Simferopol
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+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
+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:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19900101T000000
+RDATE:19900101T000000
+RDATE:19970101T000000
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900701T020000
+RDATE:19900701T020000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920101T000000
+RDATE:19920101T000000
+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=19930925T210000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19940501T000000
+RDATE:19940501T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+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
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T040000
+RDATE:19961027T040000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T040000
+RDATE:19970330T040000
+TZNAME:EEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19971026T040000
+RRULE:FREQ=YEARLY;UNTIL=20101031T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19980329T030000
+RRULE:FREQ=YEARLY;UNTIL=20100328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20110327T030000
+RDATE:20110327T030000
+TZNAME:FET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Skopje.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Skopje.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Skopje.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,77 +1,77 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Skopje
-X-LIC-LOCATION:Europe/Skopje
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
-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:19450101T000000
-RDATE:19450101T000000
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821127T000000
-RDATE:19821127T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T030000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Skopje
+X-LIC-LOCATION:Europe/Skopje
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+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:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T030000
+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/Sofia.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sofia.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Sofia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,135 +1,135 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Sofia
-X-LIC-LOCATION:Europe/Sofia
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:IMT
-TZOFFSETFROM:+013316
-TZOFFSETTO:+015656
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18941130T000000
-RDATE:18941130T000000
-TZNAME:EET
-TZOFFSETFROM:+015656
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-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:19450101T000000
-RDATE:19450101T000000
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450402T030000
-RDATE:19450402T030000
-TZNAME:EET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19790331T230000
-RDATE:19790331T230000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Sofia
+X-LIC-LOCATION:Europe/Sofia
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:IMT
+TZOFFSETFROM:+013316
+TZOFFSETTO:+015656
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18941130T000000
+RDATE:18941130T000000
+TZNAME:EET
+TZOFFSETFROM:+015656
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+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:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450402T030000
+RDATE:19450402T030000
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19790331T230000
+RDATE:19790331T230000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Stockholm.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Stockholm
-X-LIC-LOCATION:Europe/Stockholm
-BEGIN:STANDARD
-DTSTART:18790101T000000
-RDATE:18790101T000000
-TZNAME:SET
-TZOFFSETFROM:+011212
-TZOFFSETTO:+010014
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19000101T000000
-RDATE:19000101T000000
-TZNAME:CET
-TZOFFSETFROM:+010014
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19160514T230000
-RDATE:19160514T230000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19800101T000000
-RDATE:19800101T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19800406T020000
-RDATE:19800406T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Stockholm
+X-LIC-LOCATION:Europe/Stockholm
+BEGIN:STANDARD
+DTSTART:18790101T000000
+RDATE:18790101T000000
+TZNAME:SET
+TZOFFSETFROM:+011212
+TZOFFSETTO:+010014
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19000101T000000
+RDATE:19000101T000000
+TZNAME:CET
+TZOFFSETFROM:+010014
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19160514T230000
+RDATE:19160514T230000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19800101T000000
+RDATE:19800101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19800406T020000
+RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+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/Tallinn.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tallinn.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tallinn.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,175 +1,175 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Tallinn
-X-LIC-LOCATION:Europe/Tallinn
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:TMT
-TZOFFSETFROM:+0139
-TZOFFSETTO:+0139
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180201T000000
-RDATE:19180201T000000
-TZNAME:CEST
-TZOFFSETFROM:+0139
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180415T020000
-RDATE:19180415T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19210501T000000
-RDATE:19210501T000000
-TZNAME:EET
-TZOFFSETFROM:+0139
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19400806T000000
-RDATE:19400806T000000
-TZNAME:MSK
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-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:+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:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19890326T020000
-RDATE:19890326T020000
-RDATE:19980922T000000
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Tallinn
+X-LIC-LOCATION:Europe/Tallinn
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:TMT
+TZOFFSETFROM:+0139
+TZOFFSETTO:+0139
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180201T000000
+RDATE:19180201T000000
+TZNAME:CEST
+TZOFFSETFROM:+0139
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180415T020000
+RDATE:19180415T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19210501T000000
+RDATE:19210501T000000
+TZNAME:EET
+TZOFFSETFROM:+0139
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400806T000000
+RDATE:19400806T000000
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+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:+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:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19890326T020000
+RDATE:19890326T020000
+RDATE:19980922T000000
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tirane.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,81 +1,81 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Tirane
-X-LIC-LOCATION:Europe/Tirane
-BEGIN:STANDARD
-DTSTART:19140101T000000
-RDATE:19140101T000000
-TZNAME:CET
-TZOFFSETFROM:+011920
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400616T000000
-RDATE:19400616T000000
-RDATE:19430329T020000
-RDATE:19740504T000000
-RDATE:19750501T000000
-RDATE:19760502T000000
-RDATE:19770508T000000
-RDATE:19780506T000000
-RDATE:19790505T000000
-RDATE:19800503T000000
-RDATE:19810426T000000
-RDATE:19820502T000000
-RDATE:19830418T000000
-RDATE:19840401T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19430410T030000
-RDATE:19741002T000000
-RDATE:19751002T000000
-RDATE:19761003T000000
-RDATE:19771002T000000
-RDATE:19781001T000000
-RDATE:19790930T000000
-RDATE:19801004T000000
-RDATE:19810927T000000
-RDATE:19821003T000000
-RDATE:19831001T000000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Tirane
+X-LIC-LOCATION:Europe/Tirane
+BEGIN:STANDARD
+DTSTART:19140101T000000
+RDATE:19140101T000000
+TZNAME:CET
+TZOFFSETFROM:+011920
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400616T000000
+RDATE:19400616T000000
+RDATE:19430329T020000
+RDATE:19740504T000000
+RDATE:19750501T000000
+RDATE:19760502T000000
+RDATE:19770508T000000
+RDATE:19780506T000000
+RDATE:19790505T000000
+RDATE:19800503T000000
+RDATE:19810426T000000
+RDATE:19820502T000000
+RDATE:19830418T000000
+RDATE:19840401T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19430410T030000
+RDATE:19741002T000000
+RDATE:19751002T000000
+RDATE:19761003T000000
+RDATE:19771002T000000
+RDATE:19781001T000000
+RDATE:19790930T000000
+RDATE:19801004T000000
+RDATE:19810927T000000
+RDATE:19821003T000000
+RDATE:19831001T000000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Tiraspol.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,171 +1,171 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Tiraspol
-X-LIC-LOCATION:Europe/Tiraspol
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:CMT
-TZOFFSETFROM:+015520
-TZOFFSETTO:+0155
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180215T000000
-RDATE:19180215T000000
-TZNAME:BMT
-TZOFFSETFROM:+0155
-TZOFFSETTO:+014424
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19310724T000000
-RDATE:19310724T000000
-TZNAME:EEST
-TZOFFSETFROM:+014424
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19320521T000000
-RDATE:19320521T000000
-RDATE:19910331T020000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19400815T000000
-RDATE:19400815T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410717T000000
-RDATE:19410717T000000
-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:19440824T000000
-RDATE:19440824T000000
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Tiraspol
+X-LIC-LOCATION:Europe/Tiraspol
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:CMT
+TZOFFSETFROM:+015520
+TZOFFSETTO:+0155
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180215T000000
+RDATE:19180215T000000
+TZNAME:BMT
+TZOFFSETFROM:+0155
+TZOFFSETTO:+014424
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19310724T000000
+RDATE:19310724T000000
+TZNAME:EEST
+TZOFFSETFROM:+014424
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19320521T000000
+RDATE:19320521T000000
+RDATE:19910331T020000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19400815T000000
+RDATE:19400815T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410717T000000
+RDATE:19410717T000000
+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:19440824T000000
+RDATE:19440824T000000
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Uzhgorod.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,147 +1,154 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Uzhgorod
-X-LIC-LOCATION:Europe/Uzhgorod
-BEGIN:STANDARD
-DTSTART:18901001T000000
-RDATE:18901001T000000
-TZNAME:CET
-TZOFFSETFROM:+012912
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19400101T000000
-RDATE:19400101T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400401T020000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441026T000000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19441001T000000
-RDATE:19441001T000000
-TZNAME:CEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450629T000000
-RDATE:19450629T000000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0100
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900701T020000
-RDATE:19900701T020000
-TZNAME:CET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19910331T030000
-RDATE:19910331T030000
-TZNAME:EET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-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: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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Uzhgorod
+X-LIC-LOCATION:Europe/Uzhgorod
+BEGIN:STANDARD
+DTSTART:18901001T000000
+RDATE:18901001T000000
+TZNAME:CET
+TZOFFSETFROM:+012912
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400101T000000
+RDATE:19400101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400401T020000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441026T000000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19441001T000000
+RDATE:19441001T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450629T000000
+RDATE:19450629T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0100
+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
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900701T020000
+RDATE:19900701T020000
+TZNAME:CET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19910331T030000
+RDATE:19910331T030000
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+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;UNTIL=20100328T010000Z;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;UNTIL=20101031T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T030000
+RDATE:20110327T030000
+TZNAME:FET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vaduz.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vaduz.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vaduz.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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/Vatican.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vatican.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vatican.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,153 +1,153 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Vatican
-X-LIC-LOCATION:Europe/Vatican
-BEGIN:STANDARD
-DTSTART:18660922T000000
-RDATE:18660922T000000
-TZNAME:RMT
-TZOFFSETFROM:+004956
-TZOFFSETTO:+004956
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18931101T000000
-RDATE:18931101T000000
-TZNAME:CEST
-TZOFFSETFROM:+004956
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160603T000000
-RDATE:19160603T000000
-RDATE:19170401T000000
-RDATE:19180310T000000
-RDATE:19190302T000000
-RDATE:19200321T000000
-RDATE:19400615T000000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19460317T020000
-RDATE:19470316T000000
-RDATE:19480229T020000
-RDATE:19690601T000000
-RDATE:19700531T000000
-RDATE:19730603T000000
-RDATE:19740526T000000
-RDATE:19750601T000000
-RDATE:19760530T000000
-RDATE:19800406T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170930T010000
-RDATE:19200919T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19440917T010000
-RDATE:19450915T010000
-RDATE:19461006T030000
-RDATE:19471005T010000
-RDATE:19481003T030000
-RDATE:19700927T000000
-RDATE:19710926T010000
-RDATE:19721001T000000
-RDATE:19781001T010000
-RDATE:19790930T010000
-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: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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Vatican
+X-LIC-LOCATION:Europe/Vatican
+BEGIN:STANDARD
+DTSTART:18660922T000000
+RDATE:18660922T000000
+TZNAME:RMT
+TZOFFSETFROM:+004956
+TZOFFSETTO:+004956
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18931101T000000
+RDATE:18931101T000000
+TZNAME:CEST
+TZOFFSETFROM:+004956
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160603T000000
+RDATE:19160603T000000
+RDATE:19170401T000000
+RDATE:19180310T000000
+RDATE:19190302T000000
+RDATE:19200321T000000
+RDATE:19400615T000000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19450402T020000
+RDATE:19460317T020000
+RDATE:19470316T000000
+RDATE:19480229T020000
+RDATE:19690601T000000
+RDATE:19700531T000000
+RDATE:19730603T000000
+RDATE:19740526T000000
+RDATE:19750601T000000
+RDATE:19760530T000000
+RDATE:19800406T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170930T010000
+RDATE:19200919T010000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19440917T010000
+RDATE:19450915T010000
+RDATE:19461006T030000
+RDATE:19471005T010000
+RDATE:19481003T030000
+RDATE:19700927T000000
+RDATE:19710926T010000
+RDATE:19721001T000000
+RDATE:19781001T010000
+RDATE:19790930T010000
+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: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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vienna.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,102 +1,102 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Vienna
-X-LIC-LOCATION:Europe/Vienna
-BEGIN:STANDARD
-DTSTART:18930401T000000
-RDATE:18930401T000000
-TZNAME:CEST
-TZOFFSETFROM:+010520
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160430T230000
-RDATE:19160430T230000
-RDATE:19200405T020000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19460414T020000
-RDATE:19470406T020000
-RDATE:19480418T020000
-RDATE:19800406T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19200913T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-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
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Vienna
+X-LIC-LOCATION:Europe/Vienna
+BEGIN:STANDARD
+DTSTART:18930401T000000
+RDATE:18930401T000000
+TZNAME:CEST
+TZOFFSETFROM:+010520
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160430T230000
+RDATE:19160430T230000
+RDATE:19200405T020000
+RDATE:19400401T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+RDATE:19460414T020000
+RDATE:19470406T020000
+RDATE:19480418T020000
+RDATE:19800406T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19200913T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+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
+DTSTART:19170917T030000
+RRULE:FREQ=YEARLY;UNTIL=19180916T010000Z;BYDAY=3MO;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Vilnius.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,175 +1,175 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Vilnius
-X-LIC-LOCATION:Europe/Vilnius
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:WMT
-TZOFFSETFROM:+014116
-TZOFFSETTO:+0124
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19170101T000000
-RDATE:19170101T000000
-TZNAME:KMT
-TZOFFSETFROM:+0124
-TZOFFSETTO:+013536
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19191010T000000
-RDATE:19191010T000000
-TZNAME:CET
-TZOFFSETFROM:+013536
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19200712T000000
-RDATE:19200712T000000
-TZNAME:EET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410624T000000
-RDATE:19410624T000000
-TZNAME:CEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19430329T020000
-RDATE:19430329T020000
-RDATE:19440403T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19440801T000000
-RDATE:19440801T000000
-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
-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
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;UNTIL=19971026T000000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19980101T000000
-RDATE:19980101T000000
-RDATE:19991031T030000
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Vilnius
+X-LIC-LOCATION:Europe/Vilnius
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:WMT
+TZOFFSETFROM:+014116
+TZOFFSETTO:+0124
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19170101T000000
+RDATE:19170101T000000
+TZNAME:KMT
+TZOFFSETFROM:+0124
+TZOFFSETTO:+013536
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19191010T000000
+RDATE:19191010T000000
+TZNAME:CET
+TZOFFSETFROM:+013536
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19200712T000000
+RDATE:19200712T000000
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410624T000000
+RDATE:19410624T000000
+TZNAME:CEST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430329T020000
+RDATE:19430329T020000
+RDATE:19440403T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19440801T000000
+RDATE:19440801T000000
+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
+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
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=19971026T000000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19980101T000000
+RDATE:19980101T000000
+RDATE:19991031T030000
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Volgograd.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,116 +1,117 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19811001T000000
-RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
-TZNAME:VOLT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19840930T030000
-RRULE:FREQ=YEARLY;UNTIL=19880924T220000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:VOLT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19850331T020000
-RRULE:FREQ=YEARLY;UNTIL=19880326T220000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:VOLST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19890924T030000
-RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:VOLT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19900325T020000
-RDATE:19900325T020000
-TZNAME:VOLST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910331T020000
-RDATE:19910331T020000
-TZNAME:VOLT
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19920926T230000
-RDATE:19920926T230000
-TZNAME:VOLT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:VOLST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19930926T030000
-RRULE:FREQ=YEARLY;UNTIL=19950923T230000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:VOLT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:VOLT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19811001T000000
+RRULE:FREQ=YEARLY;UNTIL=19830930T190000Z;BYMONTH=10
+TZNAME:VOLT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19840930T030000
+RRULE:FREQ=YEARLY;UNTIL=19880924T220000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:VOLT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19850331T020000
+RRULE:FREQ=YEARLY;UNTIL=19880326T220000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:VOLST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19890924T030000
+RRULE:FREQ=YEARLY;UNTIL=19900929T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:VOLT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19900325T020000
+RDATE:19900325T020000
+TZNAME:VOLST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910331T020000
+RDATE:19910331T020000
+RDATE:20110327T020000
+TZNAME:VOLT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19920926T230000
+RDATE:19920926T230000
+TZNAME:VOLT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=20100327T230000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:VOLST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19930926T030000
+RRULE:FREQ=YEARLY;UNTIL=19950923T230000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:VOLT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;UNTIL=20101030T230000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:VOLT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Warsaw.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Warsaw.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Warsaw.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,190 +1,190 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170917T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441004T020000
-RDATE:19451101T000000
-RDATE:19461007T030000
-RDATE:19770925T020000
-RDATE:19781001T020000
-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:19180916T030000
-RDATE:19180916T030000
-TZNAME:EET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19400623T020000
-RDATE:19400623T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19441001T000000
-RDATE:19441001T000000
-TZNAME:CEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-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:19570929T020000
-RRULE:FREQ=YEARLY;UNTIL=19580928T000000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19591004T020000
-RRULE:FREQ=YEARLY;UNTIL=19611001T000000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19610528T010000
-RRULE:FREQ=YEARLY;UNTIL=19640531T000000Z;BYDAY=-1SU;BYMONTH=5
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19620930T020000
-RRULE:FREQ=YEARLY;UNTIL=19640927T000000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19770101T000000
-RDATE:19770101T000000
-RDATE:19880101T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19770403T010000
-RRULE:FREQ=YEARLY;UNTIL=19800406T000000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;UNTIL=19870927T000000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170917T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441004T020000
+RDATE:19451101T000000
+RDATE:19461007T030000
+RDATE:19770925T020000
+RDATE:19781001T020000
+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:19180916T030000
+RDATE:19180916T030000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400623T020000
+RDATE:19400623T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19441001T000000
+RDATE:19441001T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+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:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19591004T020000
+RRULE:FREQ=YEARLY;UNTIL=19611001T000000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19610528T010000
+RRULE:FREQ=YEARLY;UNTIL=19640531T000000Z;BYDAY=-1SU;BYMONTH=5
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19620930T020000
+RRULE:FREQ=YEARLY;UNTIL=19640927T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19770101T000000
+RDATE:19770101T000000
+RDATE:19880101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T010000
+RRULE:FREQ=YEARLY;UNTIL=19800406T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19870927T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zagreb.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,77 +1,77 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Zagreb
-X-LIC-LOCATION:Europe/Zagreb
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19421102T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19450916T030000
-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:19450101T000000
-RDATE:19450101T000000
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19821127T000000
-RDATE:19821127T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830327T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T030000
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Zagreb
+X-LIC-LOCATION:Europe/Zagreb
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19421102T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441002T030000
+RDATE:19450916T030000
+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:19450101T000000
+RDATE:19450101T000000
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19821127T000000
+RDATE:19821127T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830327T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T030000
+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/Zaporozhye.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zaporozhye.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zaporozhye.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,136 +1,143 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Zaporozhye
-X-LIC-LOCATION:Europe/Zaporozhye
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:CUT
-TZOFFSETFROM:+022040
-TZOFFSETTO:+0220
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19240502T000000
-RDATE:19240502T000000
-TZNAME:EET
-TZOFFSETFROM:+0220
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19300621T000000
-RDATE:19300621T000000
-TZNAME:MSK
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410825T000000
-RDATE:19410825T000000
-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
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19431025T000000
-RDATE:19431025T000000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0100
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Zaporozhye
+X-LIC-LOCATION:Europe/Zaporozhye
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:CUT
+TZOFFSETFROM:+022040
+TZOFFSETTO:+0220
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19240502T000000
+RDATE:19240502T000000
+TZNAME:EET
+TZOFFSETFROM:+0220
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19300621T000000
+RDATE:19300621T000000
+TZNAME:MSK
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410825T000000
+RDATE:19410825T000000
+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
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19431025T000000
+RDATE:19431025T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0100
+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
+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;UNTIL=20100328T010000Z;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;UNTIL=20101031T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T030000
+RDATE:20110327T030000
+TZNAME:FET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zurich.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zurich.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Europe/Zurich.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,65 +1,65 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Zurich
-X-LIC-LOCATION:Europe/Zurich
-BEGIN:STANDARD
-DTSTART:18480912T000000
-RDATE:18480912T000000
-TZNAME:BMT
-TZOFFSETFROM:+003408
-TZOFFSETTO:+002944
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18940601T000000
-RDATE:18940601T000000
-TZNAME:CEST
-TZOFFSETFROM:+002944
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19410505T010000
-RRULE:FREQ=YEARLY;UNTIL=19420504T000000Z;BYDAY=1MO;BYMONTH=5
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19411006T020000
-RRULE:FREQ=YEARLY;UNTIL=19421005T000000Z;BYDAY=1MO;BYMONTH=10
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Europe/Zurich
+X-LIC-LOCATION:Europe/Zurich
+BEGIN:STANDARD
+DTSTART:18480912T000000
+RDATE:18480912T000000
+TZNAME:BMT
+TZOFFSETFROM:+003408
+TZOFFSETTO:+002944
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18940601T000000
+RDATE:18940601T000000
+TZNAME:CEST
+TZOFFSETFROM:+002944
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19410505T010000
+RRULE:FREQ=YEARLY;UNTIL=19420504T000000Z;BYDAY=1MO;BYMONTH=5
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19411006T020000
+RRULE:FREQ=YEARLY;UNTIL=19421005T000000Z;BYDAY=1MO;BYMONTH=10
+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/GB-Eire.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GB-Eire.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GB-Eire.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,291 +1,291 @@
-BEGIN:VCALENDAR
-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
-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:+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
-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
-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=19601002T020000Z;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: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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
-TZNAME:GMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960101T000000
-RDATE:19960101T000000
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:GMT/BST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:+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
+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
+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=19601002T020000Z;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: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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/GB.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GB.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GB.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,291 +1,291 @@
-BEGIN:VCALENDAR
-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
-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:+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
-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
-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=19601002T020000Z;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: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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19610326T020000
-RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-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
-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
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19901028T020000
-RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
-TZNAME:GMT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960101T000000
-RDATE:19960101T000000
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19960331T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:GMT/BST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:GMT/BST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:+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
+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
+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=19601002T020000Z;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: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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19610326T020000
+RRULE:FREQ=YEARLY;UNTIL=19630331T020000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+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
+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
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19901028T020000
+RRULE:FREQ=YEARLY;UNTIL=19951022T010000Z;BYDAY=4SU;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19960331T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:GMT/BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT/BST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/GMT+0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GMT+0.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GMT+0.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/GMT-0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GMT-0.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GMT-0.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/GMT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GMT.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GMT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/GMT0.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/GMT0.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/GMT0.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Greenwich.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Greenwich.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Greenwich.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/HST.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/HST.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/HST.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Hongkong.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,114 +1,114 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Hongkong
-X-LIC-LOCATION:Hongkong
-BEGIN:STANDARD
-DTSTART:19041030T000000
-RDATE:19041030T000000
-TZNAME:HKST
-TZOFFSETFROM:+073636
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19410401T033000
-RDATE:19410401T033000
-RDATE:19460420T033000
-RDATE:19470413T033000
-RDATE:19480502T033000
-RDATE:19731230T033000
-RDATE:19790513T033000
-TZNAME:HKST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19411225T000000
-RDATE:19411225T000000
-TZNAME:JST
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450915T000000
-RDATE:19450915T000000
-TZNAME:HKST
-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
-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
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Hongkong
+X-LIC-LOCATION:Hongkong
+BEGIN:STANDARD
+DTSTART:19041030T000000
+RDATE:19041030T000000
+TZNAME:HKST
+TZOFFSETFROM:+073636
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19410401T033000
+RDATE:19410401T033000
+RDATE:19460420T033000
+RDATE:19470413T033000
+RDATE:19480502T033000
+RDATE:19731230T033000
+RDATE:19790513T033000
+TZNAME:HKST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19411225T000000
+RDATE:19411225T000000
+TZNAME:JST
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450915T000000
+RDATE:19450915T000000
+TZNAME:HKST
+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
+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
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Iceland.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,89 +1,89 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Iceland
-X-LIC-LOCATION:Iceland
-BEGIN:STANDARD
-DTSTART:18370101T000000
-RDATE:18370101T000000
-TZNAME:RMT
-TZOFFSETFROM:-012724
-TZOFFSETTO:-012748
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19080101T000000
-RDATE:19080101T000000
-TZNAME:ISST
-TZOFFSETFROM:-012748
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170219T230000
-RRULE:FREQ=YEARLY;UNTIL=19180220T000000Z;BYMONTH=2
-TZNAME:ISST
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19171021T010000
-RDATE:19171021T010000
-RDATE:19181116T010000
-RDATE:19391129T020000
-RDATE:19401103T020000
-RDATE:19411102T020000
-RDATE:19421025T020000
-RDATE:19491030T020000
-RDATE:19671029T020000
-TZNAME:IST
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Iceland
+X-LIC-LOCATION:Iceland
+BEGIN:STANDARD
+DTSTART:18370101T000000
+RDATE:18370101T000000
+TZNAME:RMT
+TZOFFSETFROM:-012724
+TZOFFSETTO:-012748
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19080101T000000
+RDATE:19080101T000000
+TZNAME:ISST
+TZOFFSETFROM:-012748
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170219T230000
+RRULE:FREQ=YEARLY;UNTIL=19180220T000000Z;BYMONTH=2
+TZNAME:ISST
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19171021T010000
+RDATE:19171021T010000
+RDATE:19181116T010000
+RDATE:19391129T020000
+RDATE:19401103T020000
+RDATE:19411102T020000
+RDATE:19421025T020000
+RDATE:19491030T020000
+RDATE:19671029T020000
+TZNAME:IST
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Antananarivo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19540227T230000
-RDATE:19540227T230000
-TZNAME:EAST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19540530T000000
-RDATE:19540530T000000
-TZNAME:EAT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Antananarivo
+X-LIC-LOCATION:Indian/Antananarivo
+BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:EAT
+TZOFFSETFROM:+031004
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19540227T230000
+RDATE:19540227T230000
+TZNAME:EAST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19540530T000000
+RDATE:19540530T000000
+TZNAME:EAT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Chagos.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Chagos.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Chagos.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19960101T000000
-RDATE:19960101T000000
-TZNAME:IOT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Chagos
+X-LIC-LOCATION:Indian/Chagos
+BEGIN:STANDARD
+DTSTART:19070101T000000
+RDATE:19070101T000000
+TZNAME:IOT
+TZOFFSETFROM:+044940
+TZOFFSETTO:+0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19960101T000000
+RDATE:19960101T000000
+TZNAME:IOT
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Christmas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Christmas.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Christmas.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Christmas
+X-LIC-LOCATION:Indian/Christmas
+BEGIN:STANDARD
+DTSTART:18950201T000000
+RDATE:18950201T000000
+TZNAME:CXT
+TZOFFSETFROM:+070252
+TZOFFSETTO:+0700
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Cocos.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Cocos.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Cocos.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Cocos
+X-LIC-LOCATION:Indian/Cocos
+BEGIN:STANDARD
+DTSTART:19000101T000000
+RDATE:19000101T000000
+TZNAME:CCT
+TZOFFSETFROM:+062740
+TZOFFSETTO:+0630
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Comoro.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Comoro.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Comoro.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Comoro
+X-LIC-LOCATION:Indian/Comoro
+BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:EAT
+TZOFFSETFROM:+025304
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Kerguelen.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Kerguelen.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Kerguelen.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Kerguelen
+X-LIC-LOCATION:Indian/Kerguelen
+BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:TFT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mahe.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mahe.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mahe.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Mahe
+X-LIC-LOCATION:Indian/Mahe
+BEGIN:STANDARD
+DTSTART:19060601T000000
+RDATE:19060601T000000
+TZNAME:SCT
+TZOFFSETFROM:+034148
+TZOFFSETTO:+0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Maldives.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Maldives.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Maldives.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19600101T000000
-RDATE:19600101T000000
-TZNAME:MVT
-TZOFFSETFROM:+0454
-TZOFFSETTO:+0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Maldives
+X-LIC-LOCATION:Indian/Maldives
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
+TZOFFSETFROM:+0454
+TZOFFSETTO:+0454
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19600101T000000
+RDATE:19600101T000000
+TZNAME:MVT
+TZOFFSETFROM:+0454
+TZOFFSETTO:+0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mauritius.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mauritius.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mauritius.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,32 +1,32 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Indian/Mauritius
-X-LIC-LOCATION:Indian/Mauritius
-BEGIN:STANDARD
-DTSTART:19070101T000000
-RDATE:19070101T000000
-TZNAME:MUST
-TZOFFSETFROM:+0350
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19821010T000000
-RDATE:19821010T000000
-RDATE:20081026T020000
-TZNAME:MUST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830321T000000
-RDATE:19830321T000000
-RDATE:20090329T020000
-TZNAME:MUT
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Mauritius
+X-LIC-LOCATION:Indian/Mauritius
+BEGIN:STANDARD
+DTSTART:19070101T000000
+RDATE:19070101T000000
+TZNAME:MUST
+TZOFFSETFROM:+0350
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19821010T000000
+RDATE:19821010T000000
+RDATE:20081026T020000
+TZNAME:MUST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Mayotte.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Mayotte
+X-LIC-LOCATION:Indian/Mayotte
+BEGIN:STANDARD
+DTSTART:19110701T000000
+RDATE:19110701T000000
+TZNAME:EAT
+TZOFFSETFROM:+030056
+TZOFFSETTO:+0300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Reunion.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Reunion.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Indian/Reunion.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Indian/Reunion
+X-LIC-LOCATION:Indian/Reunion
+BEGIN:STANDARD
+DTSTART:19110601T000000
+RDATE:19110601T000000
+TZNAME:RET
+TZOFFSETFROM:+034152
+TZOFFSETTO:+0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Iran.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Iran.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Iran.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,159 +1,159 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Iran
-X-LIC-LOCATION:Iran
-BEGIN:STANDARD
-DTSTART:19160101T000000
-RDATE:19160101T000000
-TZNAME:TMT
-TZOFFSETFROM:+032544
-TZOFFSETTO:+032544
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-TZNAME:IRST
-TZOFFSETFROM:+032544
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19771101T000000
-RDATE:19771101T000000
-TZNAME:IRST
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19780321T000000
-RDATE:19780321T000000
-TZNAME:IRDT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19781021T000000
-RDATE:19781021T000000
-TZNAME:IRST
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19790101T000000
-RDATE:19790101T000000
-TZNAME:IRST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19790321T000000
-RRULE:FREQ=YEARLY;UNTIL=19800320T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910922T000000
-RRULE:FREQ=YEARLY;UNTIL=19950921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19920322T000000
-RRULE:FREQ=YEARLY;UNTIL=19950321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19970322T000000
-RRULE:FREQ=YEARLY;UNTIL=19990321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19970922T000000
-RRULE:FREQ=YEARLY;UNTIL=19990921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20010322T000000
-RRULE:FREQ=YEARLY;UNTIL=20030321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010922T000000
-RRULE:FREQ=YEARLY;UNTIL=20030921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20090322T000000
-RRULE:FREQ=YEARLY;UNTIL=20110321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20090922T000000
-RRULE:FREQ=YEARLY;UNTIL=20110921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20130322T000000
-RRULE:FREQ=YEARLY;UNTIL=20150321T203000Z;BYMONTH=3
-TZNAME:IRDT
-TZOFFSETFROM:+0330
-TZOFFSETTO:+0430
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20130922T000000
-RRULE:FREQ=YEARLY;UNTIL=20150921T193000Z;BYMONTH=9
-TZNAME:IRST
-TZOFFSETFROM:+0430
-TZOFFSETTO:+0330
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Iran
+X-LIC-LOCATION:Iran
+BEGIN:STANDARD
+DTSTART:19160101T000000
+RDATE:19160101T000000
+TZNAME:TMT
+TZOFFSETFROM:+032544
+TZOFFSETTO:+032544
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:IRST
+TZOFFSETFROM:+032544
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19771101T000000
+RDATE:19771101T000000
+TZNAME:IRST
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19780321T000000
+RDATE:19780321T000000
+TZNAME:IRDT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19781021T000000
+RDATE:19781021T000000
+TZNAME:IRST
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790101T000000
+RDATE:19790101T000000
+TZNAME:IRST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19790321T000000
+RRULE:FREQ=YEARLY;UNTIL=19800320T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910922T000000
+RRULE:FREQ=YEARLY;UNTIL=19950921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19920322T000000
+RRULE:FREQ=YEARLY;UNTIL=19950321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19970322T000000
+RRULE:FREQ=YEARLY;UNTIL=19990321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19970922T000000
+RRULE:FREQ=YEARLY;UNTIL=19990921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20010322T000000
+RRULE:FREQ=YEARLY;UNTIL=20030321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010922T000000
+RRULE:FREQ=YEARLY;UNTIL=20030921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20090322T000000
+RRULE:FREQ=YEARLY;UNTIL=20110321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20090922T000000
+RRULE:FREQ=YEARLY;UNTIL=20110921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20130322T000000
+RRULE:FREQ=YEARLY;UNTIL=20150321T203000Z;BYMONTH=3
+TZNAME:IRDT
+TZOFFSETFROM:+0330
+TZOFFSETTO:+0430
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20130922T000000
+RRULE:FREQ=YEARLY;UNTIL=20150921T193000Z;BYMONTH=9
+TZNAME:IRST
+TZOFFSETFROM:+0430
+TZOFFSETTO:+0330
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Israel.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Israel.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Israel.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,164 +1,164 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Israel
-X-LIC-LOCATION:Israel
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:JMT
-TZOFFSETFROM:+022056
-TZOFFSETTO:+022040
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19180101T000000
-RDATE:19180101T000000
-TZNAME:IST
-TZOFFSETFROM:+022040
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400601T000000
-RDATE:19400601T000000
-RDATE:19430401T020000
-RDATE:19440401T000000
-RDATE:19450416T000000
-RDATE:19460416T020000
-RDATE:19490501T000000
-RDATE:19500416T000000
-RDATE:19510401T000000
-RDATE:19520420T020000
-RDATE:19530412T020000
-RDATE:19540613T000000
-RDATE:19550611T020000
-RDATE:19560603T000000
-RDATE:19570429T020000
-RDATE:19740707T000000
-RDATE:19750420T000000
-RDATE:19850414T000000
-RDATE:19860518T000000
-RDATE:19870415T000000
-RDATE:19880409T000000
-RDATE:19890430T000000
-RDATE:19900325T000000
-RDATE:19910324T000000
-RDATE:19920329T000000
-RDATE:19930402T000000
-RDATE:19940401T000000
-RDATE:19950331T000000
-RDATE:19960315T000000
-RDATE:19970321T000000
-RDATE:19980320T000000
-RDATE:19990402T020000
-RDATE:20000414T020000
-RDATE:20010409T010000
-RDATE:20020329T010000
-RDATE:20030328T010000
-RDATE:20040407T010000
-RDATE:20050401T020000
-RDATE:20110401T020000
-RDATE:20160401T020000
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19451101T020000
-RDATE:19451101T020000
-RDATE:19461101T000000
-RDATE:19500915T030000
-RDATE:19511111T030000
-RDATE:19521019T030000
-RDATE:19530913T030000
-RDATE:19540912T000000
-RDATE:19550911T000000
-RDATE:19560930T030000
-RDATE:19570922T000000
-RDATE:19741013T000000
-RDATE:19750831T000000
-RDATE:19850915T000000
-RDATE:19860907T000000
-RDATE:19870913T000000
-RDATE:19880903T000000
-RDATE:19890903T000000
-RDATE:19900826T000000
-RDATE:19910901T000000
-RDATE:19920906T000000
-RDATE:19930905T000000
-RDATE:19940828T000000
-RDATE:19950903T000000
-RDATE:19960916T000000
-RDATE:19970914T000000
-RDATE:19980906T000000
-RDATE:19990903T020000
-RDATE:20001006T010000
-RDATE:20010924T010000
-RDATE:20021007T010000
-RDATE:20031003T010000
-RDATE:20040922T010000
-RDATE:20051009T020000
-RDATE:20061001T020000
-RDATE:20070916T020000
-RDATE:20081005T020000
-RDATE:20090927T020000
-RDATE:20100912T020000
-RDATE:20111002T020000
-RDATE:20120923T020000
-RDATE:20130908T020000
-RDATE:20140928T020000
-RDATE:20150920T020000
-RDATE:20161009T020000
-RDATE:20170924T020000
-TZNAME:IST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Israel
+X-LIC-LOCATION:Israel
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:JMT
+TZOFFSETFROM:+022056
+TZOFFSETTO:+022040
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19180101T000000
+RDATE:19180101T000000
+TZNAME:IST
+TZOFFSETFROM:+022040
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400601T000000
+RDATE:19400601T000000
+RDATE:19430401T020000
+RDATE:19440401T000000
+RDATE:19450416T000000
+RDATE:19460416T020000
+RDATE:19490501T000000
+RDATE:19500416T000000
+RDATE:19510401T000000
+RDATE:19520420T020000
+RDATE:19530412T020000
+RDATE:19540613T000000
+RDATE:19550611T020000
+RDATE:19560603T000000
+RDATE:19570429T020000
+RDATE:19740707T000000
+RDATE:19750420T000000
+RDATE:19850414T000000
+RDATE:19860518T000000
+RDATE:19870415T000000
+RDATE:19880409T000000
+RDATE:19890430T000000
+RDATE:19900325T000000
+RDATE:19910324T000000
+RDATE:19920329T000000
+RDATE:19930402T000000
+RDATE:19940401T000000
+RDATE:19950331T000000
+RDATE:19960315T000000
+RDATE:19970321T000000
+RDATE:19980320T000000
+RDATE:19990402T020000
+RDATE:20000414T020000
+RDATE:20010409T010000
+RDATE:20020329T010000
+RDATE:20030328T010000
+RDATE:20040407T010000
+RDATE:20050401T020000
+RDATE:20110401T020000
+RDATE:20160401T020000
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19451101T020000
+RDATE:19451101T020000
+RDATE:19461101T000000
+RDATE:19500915T030000
+RDATE:19511111T030000
+RDATE:19521019T030000
+RDATE:19530913T030000
+RDATE:19540912T000000
+RDATE:19550911T000000
+RDATE:19560930T030000
+RDATE:19570922T000000
+RDATE:19741013T000000
+RDATE:19750831T000000
+RDATE:19850915T000000
+RDATE:19860907T000000
+RDATE:19870913T000000
+RDATE:19880903T000000
+RDATE:19890903T000000
+RDATE:19900826T000000
+RDATE:19910901T000000
+RDATE:19920906T000000
+RDATE:19930905T000000
+RDATE:19940828T000000
+RDATE:19950903T000000
+RDATE:19960916T000000
+RDATE:19970914T000000
+RDATE:19980906T000000
+RDATE:19990903T020000
+RDATE:20001006T010000
+RDATE:20010924T010000
+RDATE:20021007T010000
+RDATE:20031003T010000
+RDATE:20040922T010000
+RDATE:20051009T020000
+RDATE:20061001T020000
+RDATE:20070916T020000
+RDATE:20081005T020000
+RDATE:20090927T020000
+RDATE:20100912T020000
+RDATE:20111002T020000
+RDATE:20120923T020000
+RDATE:20130908T020000
+RDATE:20140928T020000
+RDATE:20150920T020000
+RDATE:20161009T020000
+RDATE:20170924T020000
+TZNAME:IST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+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;BYMONTH=3
+TZNAME:IDT
+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;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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Jamaica.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Jamaica
-X-LIC-LOCATION:Jamaica
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:KMT
-TZOFFSETFROM:-050712
-TZOFFSETTO:-050712
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19120201T000000
-RDATE:19120201T000000
-TZNAME:EST
-TZOFFSETFROM:-050712
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19740428T020000
-RDATE:19740428T020000
-TZNAME:EST
-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
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19840101T000000
-RDATE:19840101T000000
-TZNAME:EST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Jamaica
+X-LIC-LOCATION:Jamaica
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KMT
+TZOFFSETFROM:-050712
+TZOFFSETTO:-050712
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19120201T000000
+RDATE:19120201T000000
+TZNAME:EST
+TZOFFSETFROM:-050712
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19740428T020000
+RDATE:19740428T020000
+TZNAME:EST
+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
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19840101T000000
+RDATE:19840101T000000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Japan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Japan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Japan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,52 +1,52 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Japan
-X-LIC-LOCATION:Japan
-BEGIN:STANDARD
-DTSTART:18880101T001859
-RDATE:18880101T001859
-TZNAME:JST
-TZOFFSETFROM:+091859
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18960101T000000
-RDATE:18960101T000000
-TZNAME:CJT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19380101T000000
-RDATE:19380101T000000
-TZNAME:JST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:DAYLIGHT
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Japan
+X-LIC-LOCATION:Japan
+BEGIN:STANDARD
+DTSTART:18880101T001859
+RDATE:18880101T001859
+TZNAME:JST
+TZOFFSETFROM:+091859
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18960101T000000
+RDATE:18960101T000000
+TZNAME:CJT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19380101T000000
+RDATE:19380101T000000
+TZNAME:JST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:DAYLIGHT
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Kwajalein.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691001T000000
-RDATE:19691001T000000
-TZNAME:KWAT
-TZOFFSETFROM:+1100
-TZOFFSETTO:-1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19930820T000000
-RDATE:19930820T000000
-TZNAME:MHT
-TZOFFSETFROM:-1200
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Kwajalein
+X-LIC-LOCATION:Kwajalein
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:MHT
+TZOFFSETFROM:+110920
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691001T000000
+RDATE:19691001T000000
+TZNAME:KWAT
+TZOFFSETFROM:+1100
+TZOFFSETTO:-1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19930820T000000
+RDATE:19930820T000000
+TZNAME:MHT
+TZOFFSETFROM:-1200
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Libya.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Libya.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Libya.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,95 +1,95 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19520101T000000
-RDATE:19520101T000000
-RDATE:19540101T000000
-RDATE:19560101T000000
-RDATE:19861003T000000
-RDATE:19960930T000000
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19590101T000000
-RDATE:19590101T000000
-RDATE:19900504T000000
-TZNAME:EET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820101T000000
-RDATE:19820101T000000
-TZNAME:CEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19820401T000000
-RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z;BYMONTH=4
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19821001T000000
-RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z;BYMONTH=10
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870401T000000
-RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z;BYMONTH=4
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19871001T000000
-RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z;BYMONTH=10
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19970404T000000
-RDATE:19970404T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19971004T000000
-RDATE:19971004T000000
-TZNAME:EET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19520101T000000
+RDATE:19520101T000000
+RDATE:19540101T000000
+RDATE:19560101T000000
+RDATE:19861003T000000
+RDATE:19960930T000000
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19590101T000000
+RDATE:19590101T000000
+RDATE:19900504T000000
+TZNAME:EET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19820401T000000
+RRULE:FREQ=YEARLY;UNTIL=19840331T230000Z;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19821001T000000
+RRULE:FREQ=YEARLY;UNTIL=19850930T220000Z;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870401T000000
+RRULE:FREQ=YEARLY;UNTIL=19890331T230000Z;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19871001T000000
+RRULE:FREQ=YEARLY;UNTIL=19890930T220000Z;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19970404T000000
+RDATE:19970404T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19971004T000000
+RDATE:19971004T000000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/MET.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/MET.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/MET.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,87 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/MST.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/MST.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/MST.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/MST7MDT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/MST7MDT.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/MST7MDT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaNorte.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,154 +1,154 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Mexico/BajaNorte
-X-LIC-LOCATION:Mexico/BajaNorte
-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;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;UNTIL=20090405T100000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-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
-DTSTART:20100314T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20101107T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Mexico/BajaNorte
+X-LIC-LOCATION:Mexico/BajaNorte
+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;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;UNTIL=20090405T100000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+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
+DTSTART:20100314T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20101107T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaSur.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaSur.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/BajaSur.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,84 +1,84 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Mexico/BajaSur
-X-LIC-LOCATION:Mexico/BajaSur
-BEGIN:STANDARD
-DTSTART:19211231T235420
-RDATE:19211231T235420
-TZNAME:MST
-TZOFFSETFROM:-070540
-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;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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Mexico/BajaSur
+X-LIC-LOCATION:Mexico/BajaSur
+BEGIN:STANDARD
+DTSTART:19211231T235420
+RDATE:19211231T235420
+TZNAME:MST
+TZOFFSETFROM:-070540
+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;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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Mexico/General.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,96 +1,96 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Mexico/General
-X-LIC-LOCATION:Mexico/General
-BEGIN:STANDARD
-DTSTART:19220101T002324
-RDATE:19220101T002324
-TZNAME:MST
-TZOFFSETFROM:-063636
-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
-TZNAME:MST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19390205T000000
-RDATE:19390205T000000
-RDATE:19401209T000000
-RDATE:19500212T000000
-RDATE:20010506T020000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-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
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Mexico/General
+X-LIC-LOCATION:Mexico/General
+BEGIN:STANDARD
+DTSTART:19220101T002324
+RDATE:19220101T002324
+TZNAME:MST
+TZOFFSETFROM:-063636
+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
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19390205T000000
+RDATE:19390205T000000
+RDATE:19401209T000000
+RDATE:19500212T000000
+RDATE:20010506T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+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
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;UNTIL=20001029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/NZ-CHAT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,73 +1,73 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19750223T034500
-RDATE:19750223T034500
-TZNAME:CHAST
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19751026T024500
-RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CHADT
-TZOFFSETFROM:+1245
-TZOFFSETTO:+1345
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19760307T034500
-RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CHAST
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900318T034500
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:CHAST
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
-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
-TZOFFSETFROM:+1245
-TZOFFSETTO:+1345
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T034500
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:CHAST
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19750223T034500
+RDATE:19750223T034500
+TZNAME:CHAST
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19751026T024500
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CHADT
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19760307T034500
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CHAST
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900318T034500
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CHAST
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+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
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T034500
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CHAST
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/NZ.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/NZ.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/NZ.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19290317T020000
-RRULE:FREQ=YEARLY;UNTIL=19330318T140000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:NZMT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1130
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19340429T020000
-RRULE:FREQ=YEARLY;UNTIL=19400427T140000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:NZMT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1130
-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
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19741103T020000
-RDATE:19741103T020000
-RDATE:19891008T020000
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19750223T030000
-RDATE:19750223T030000
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19760307T030000
-RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-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
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19290317T020000
+RRULE:FREQ=YEARLY;UNTIL=19330318T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZMT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19340429T020000
+RRULE:FREQ=YEARLY;UNTIL=19400427T140000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:NZMT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1130
+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
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19741103T020000
+RDATE:19741103T020000
+RDATE:19891008T020000
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19750223T030000
+RDATE:19750223T030000
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19760307T030000
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+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
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Navajo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Navajo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Navajo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,134 +1,134 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T020000
-RDATE:19201031T020000
-RDATE:19210522T020000
-RDATE:19450930T020000
-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:DAYLIGHT
-DTSTART:19650425T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19210522T020000
+RDATE:19450930T020000
+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:DAYLIGHT
+DTSTART:19650425T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
+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/PRC.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/PRC.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/PRC.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,54 +1,54 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:PRC
-X-LIC-LOCATION:PRC
-BEGIN:STANDARD
-DTSTART:19280101T000000
-RDATE:19280101T000000
-TZNAME:CST
-TZOFFSETFROM:+080552
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19400603T000000
-RDATE:19400603T000000
-RDATE:19410316T000000
-RDATE:19860504T000000
-TZNAME:CDT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:PRC
+X-LIC-LOCATION:PRC
+BEGIN:STANDARD
+DTSTART:19280101T000000
+RDATE:19280101T000000
+TZNAME:CST
+TZOFFSETFROM:+080552
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19400603T000000
+RDATE:19400603T000000
+RDATE:19410316T000000
+RDATE:19860504T000000
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+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
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/PST8PDT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/PST8PDT.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/PST8PDT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,101 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Apia.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,52 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific/Apia
-X-LIC-LOCATION:Pacific/Apia
-BEGIN:STANDARD
-DTSTART:19110101T000000
-RDATE:19110101T000000
-TZNAME:SAMT
-TZOFFSETFROM:-112656
-TZOFFSETTO:-1130
-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
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Apia
+X-LIC-LOCATION:Pacific/Apia
+BEGIN:STANDARD
+DTSTART:19110101T000000
+RDATE:19110101T000000
+TZNAME:SAMT
+TZOFFSETFROM:-112656
+TZOFFSETTO:-1130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:WST
+TZOFFSETFROM:-1130
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20100926T000000
+RDATE:20100926T000000
+RDATE:20110924T030000
+TZNAME:WSDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110402T040000
+RDATE:20110402T040000
+TZNAME:WST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111230T000000
+RDATE:20111230T000000
+TZNAME:WSDT
+TZOFFSETFROM:-1000
+TZOFFSETTO:+1400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20120401T040000
+RDATE:20120401T040000
+TZNAME:WST
+TZOFFSETFROM:+1400
+TZOFFSETTO:+1300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Auckland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Auckland.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Auckland.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,122 +1,122 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19290317T020000
-RRULE:FREQ=YEARLY;UNTIL=19330318T140000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:NZMT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1130
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19340429T020000
-RRULE:FREQ=YEARLY;UNTIL=19400427T140000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:NZMT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1130
-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
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19741103T020000
-RDATE:19741103T020000
-RDATE:19891008T020000
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19750223T030000
-RDATE:19750223T030000
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19751026T020000
-RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19760307T030000
-RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-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
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19290317T020000
+RRULE:FREQ=YEARLY;UNTIL=19330318T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZMT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19340429T020000
+RRULE:FREQ=YEARLY;UNTIL=19400427T140000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:NZMT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1130
+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
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19741103T020000
+RDATE:19741103T020000
+RDATE:19891008T020000
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19750223T030000
+RDATE:19750223T030000
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19751026T020000
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19760307T030000
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+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
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chatham.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chatham.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chatham.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,73 +1,73 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19750223T034500
-RDATE:19750223T034500
-TZNAME:CHAST
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19751026T024500
-RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CHADT
-TZOFFSETFROM:+1245
-TZOFFSETTO:+1345
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19760307T034500
-RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
-TZNAME:CHAST
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19900318T034500
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
-TZNAME:CHAST
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
-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
-TZOFFSETFROM:+1245
-TZOFFSETTO:+1345
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20080406T034500
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:CHAST
-TZOFFSETFROM:+1345
-TZOFFSETTO:+1245
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19750223T034500
+RDATE:19750223T034500
+TZNAME:CHAST
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19751026T024500
+RRULE:FREQ=YEARLY;UNTIL=19881029T140000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CHADT
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19760307T034500
+RRULE:FREQ=YEARLY;UNTIL=19890304T140000Z;BYDAY=1SU;BYMONTH=3
+TZNAME:CHAST
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19900318T034500
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYDAY=3SU;BYMONTH=3
+TZNAME:CHAST
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+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
+TZOFFSETFROM:+1245
+TZOFFSETTO:+1345
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20080406T034500
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:CHAST
+TZOFFSETFROM:+1345
+TZOFFSETTO:+1245
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chuuk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chuuk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Chuuk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Easter.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,166 +1,185 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific/Easter
-X-LIC-LOCATION:Pacific/Easter
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420531T220000
-RDATE:19420531T220000
-RDATE:19460831T210000
-RDATE:19690329T210000
-RDATE:19700328T210000
-RDATE:19710313T210000
-TZNAME:EAST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0700
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420731T220000
-RDATE:19420731T220000
-RDATE:19681102T210000
-RDATE:19691122T210000
-RDATE:19730929T210000
-TZNAME:EASST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460714T220000
-RDATE:19460714T220000
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19470331T210000
-RDATE:19470331T210000
-TZNAME:EAST
-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
-DTSTART:19720311T210000
-RRULE:FREQ=YEARLY;UNTIL=19810315T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-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
-DTSTART:19820313T210000
-RDATE:19820313T210000
-TZNAME:EAST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19821009T220000
-RRULE:FREQ=YEARLY;UNTIL=19871011T040000Z;BYDAY=2SA;BYMONTH=10
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830312T220000
-RRULE:FREQ=YEARLY;UNTIL=19860309T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19880312T220000
-RRULE:FREQ=YEARLY;UNTIL=19890312T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19881001T220000
-RDATE:19881001T220000
-RDATE:19891014T220000
-RDATE:19900915T220000
-RDATE:19980926T220000
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19910309T220000
-RRULE:FREQ=YEARLY;UNTIL=19960310T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19911012T220000
-RRULE:FREQ=YEARLY;UNTIL=19971012T040000Z;BYDAY=2SA;BYMONTH=10
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19991009T220000
-RRULE:FREQ=YEARLY;BYDAY=2SA;BYMONTH=10
-TZNAME:EASST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20000311T220000
-RRULE:FREQ=YEARLY;UNTIL=20070311T030000Z;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20110312T220000
-RRULE:FREQ=YEARLY;BYDAY=2SA;BYMONTH=3
-TZNAME:EAST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Easter
+X-LIC-LOCATION:Pacific/Easter
+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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420531T220000
+RDATE:19420531T220000
+RDATE:19460831T210000
+RDATE:19690329T210000
+RDATE:19700328T210000
+RDATE:19710313T210000
+TZNAME:EAST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420731T220000
+RDATE:19420731T220000
+RDATE:19681102T210000
+RDATE:19691122T210000
+RDATE:19730929T210000
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460714T220000
+RDATE:19460714T220000
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19470331T210000
+RDATE:19470331T210000
+TZNAME:EAST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19701010T210000
+RRULE:FREQ=YEARLY;UNTIL=19721015T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19720311T210000
+RRULE:FREQ=YEARLY;UNTIL=19810315T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19741012T210000
+RRULE:FREQ=YEARLY;UNTIL=19811011T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19820313T210000
+RDATE:19820313T210000
+TZNAME:EAST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19821009T220000
+RRULE:FREQ=YEARLY;UNTIL=19871011T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830312T220000
+RRULE:FREQ=YEARLY;UNTIL=19860309T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19870411T220000
+RDATE:19870411T220000
+RDATE:19900317T220000
+RDATE:19970329T220000
+RDATE:19980314T220000
+RDATE:19990403T220000
+RDATE:20080329T220000
+RDATE:20090314T220000
+RDATE:20100403T220000
+RDATE:20110507T220000
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19880312T220000
+RRULE:FREQ=YEARLY;UNTIL=19890312T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19881001T220000
+RDATE:19881001T220000
+RDATE:19891014T220000
+RDATE:19900915T220000
+RDATE:19980926T220000
+RDATE:20110820T220000
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19910309T220000
+RRULE:FREQ=YEARLY;UNTIL=19960310T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19911012T220000
+RRULE:FREQ=YEARLY;UNTIL=19971012T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19991009T220000
+RRULE:FREQ=YEARLY;UNTIL=20101010T040000Z;BYDAY=MO;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20000311T220000
+RRULE:FREQ=YEARLY;UNTIL=20070311T030000Z;BYDAY=MO;BYYEARDAY=-275,-276,-277
+ ,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20120310T220000
+RRULE:FREQ=YEARLY;BYDAY=MO;BYYEARDAY=-275,-276,-277,-278,-279,-280,-281
+TZNAME:EAST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20121013T220000
+RRULE:FREQ=YEARLY;BYDAY=MO;BYYEARDAY=-61,-62,-63,-64,-65,-66,-67
+TZNAME:EASST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Efate.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Efate.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Efate.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,49 +1,49 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific/Efate
-X-LIC-LOCATION:Pacific/Efate
-BEGIN:STANDARD
-DTSTART:19120113T000000
-RDATE:19120113T000000
-TZNAME:VUST
-TZOFFSETFROM:+111316
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19830925T000000
-RDATE:19830925T000000
-RDATE:19841023T000000
-RDATE:19921025T000000
-TZNAME:VUST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Efate
+X-LIC-LOCATION:Pacific/Efate
+BEGIN:STANDARD
+DTSTART:19120113T000000
+RDATE:19120113T000000
+TZNAME:VUST
+TZOFFSETFROM:+111316
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19830925T000000
+RDATE:19830925T000000
+RDATE:19841023T000000
+RDATE:19921025T000000
+TZNAME:VUST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Enderbury.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19791001T000000
-RDATE:19791001T000000
-TZNAME:PHOT
-TZOFFSETFROM:-1200
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19950101T000000
-RDATE:19950101T000000
-TZNAME:PHOT
-TZOFFSETFROM:-1100
-TZOFFSETTO:+1300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Enderbury
+X-LIC-LOCATION:Pacific/Enderbury
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:PHOT
+TZOFFSETFROM:-112420
+TZOFFSETTO:-1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19791001T000000
+RDATE:19791001T000000
+TZNAME:PHOT
+TZOFFSETFROM:-1200
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19950101T000000
+RDATE:19950101T000000
+TZNAME:PHOT
+TZOFFSETFROM:-1100
+TZOFFSETTO:+1300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fakaofo.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fakaofo.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fakaofo.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Fakaofo
+X-LIC-LOCATION:Pacific/Fakaofo
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:TKT
+TZOFFSETFROM:-112456
+TZOFFSETTO:-1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fiji.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fiji.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Fiji.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,46 +1,46 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19990228T030000
-RRULE:FREQ=YEARLY;UNTIL=20000226T140000Z;BYDAY=-1SU;BYMONTH=2
-TZNAME:FJT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20091129T020000
-RDATE:20091129T020000
-RDATE:20101024T020000
-TZNAME:FJST
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20100328T030000
-RDATE:20100328T030000
-RDATE:20110306T030000
-TZNAME:FJT
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19990228T030000
+RRULE:FREQ=YEARLY;UNTIL=20000226T140000Z;BYDAY=-1SU;BYMONTH=2
+TZNAME:FJT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20091129T020000
+RDATE:20091129T020000
+RDATE:20101024T020000
+TZNAME:FJST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20100328T030000
+RDATE:20100328T030000
+RDATE:20110306T030000
+TZNAME:FJT
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Funafuti.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Funafuti.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Funafuti.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Funafuti
+X-LIC-LOCATION:Pacific/Funafuti
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:TVT
+TZOFFSETFROM:+115652
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Galapagos.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Galapagos.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Galapagos.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19860101T000000
-RDATE:19860101T000000
-TZNAME:GALT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Galapagos
+X-LIC-LOCATION:Pacific/Galapagos
+BEGIN:STANDARD
+DTSTART:19310101T000000
+RDATE:19310101T000000
+TZNAME:ECT
+TZOFFSETFROM:-055824
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19860101T000000
+RDATE:19860101T000000
+TZNAME:GALT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Gambier.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Gambier.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Gambier.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Gambier
+X-LIC-LOCATION:Pacific/Gambier
+BEGIN:STANDARD
+DTSTART:19121001T000000
+RDATE:19121001T000000
+TZNAME:GAMT
+TZOFFSETFROM:-085948
+TZOFFSETTO:-0900
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guadalcanal.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guadalcanal.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guadalcanal.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Guadalcanal
+X-LIC-LOCATION:Pacific/Guadalcanal
+BEGIN:STANDARD
+DTSTART:19121001T000000
+RDATE:19121001T000000
+TZNAME:SBT
+TZOFFSETFROM:+103948
+TZOFFSETTO:+1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guam.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guam.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Guam.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific/Guam
-X-LIC-LOCATION:Pacific/Guam
-BEGIN:STANDARD
-DTSTART:19010101T000000
-RDATE:19010101T000000
-TZNAME:GST
-TZOFFSETFROM:+0939
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20001223T000000
-RDATE:20001223T000000
-TZNAME:ChST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Guam
+X-LIC-LOCATION:Pacific/Guam
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:GST
+TZOFFSETFROM:+0939
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Honolulu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,39 +1,39 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19330430T020000
-RDATE:19330430T020000
-RDATE:19420209T020000
-TZNAME:HDT
-TZOFFSETFROM:-1030
-TZOFFSETTO:-0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19330521T120000
-RDATE:19330521T120000
-RDATE:19450930T020000
-TZNAME:HST
-TZOFFSETFROM:-0930
-TZOFFSETTO:-1030
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19470608T020000
-RDATE:19470608T020000
-TZNAME:HST
-TZOFFSETFROM:-1030
-TZOFFSETTO:-1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Honolulu
+X-LIC-LOCATION:Pacific/Honolulu
+BEGIN:STANDARD
+DTSTART:18960113T120000
+RDATE:18960113T120000
+TZNAME:HST
+TZOFFSETFROM:-103126
+TZOFFSETTO:-1030
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330430T020000
+RDATE:19330430T020000
+RDATE:19420209T020000
+TZNAME:HDT
+TZOFFSETFROM:-1030
+TZOFFSETTO:-0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330521T120000
+RDATE:19330521T120000
+RDATE:19450930T020000
+TZNAME:HST
+TZOFFSETFROM:-0930
+TZOFFSETTO:-1030
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Johnston.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Johnston
+X-LIC-LOCATION:Pacific/Johnston
+BEGIN:STANDARD
+DTSTART:18000101T000000
+RDATE:18000101T000000
+TZNAME:HST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kiritimati.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kiritimati.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kiritimati.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19791001T000000
-RDATE:19791001T000000
-TZNAME:LINT
-TZOFFSETFROM:-1040
-TZOFFSETTO:-1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19950101T000000
-RDATE:19950101T000000
-TZNAME:LINT
-TZOFFSETFROM:-1000
-TZOFFSETTO:+1400
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Kiritimati
+X-LIC-LOCATION:Pacific/Kiritimati
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:LINT
+TZOFFSETFROM:-102920
+TZOFFSETTO:-1040
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19791001T000000
+RDATE:19791001T000000
+TZNAME:LINT
+TZOFFSETFROM:-1040
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19950101T000000
+RDATE:19950101T000000
+TZNAME:LINT
+TZOFFSETFROM:-1000
+TZOFFSETTO:+1400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kosrae.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kosrae.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kosrae.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691001T000000
-RDATE:19691001T000000
-TZNAME:KOST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19990101T000000
-RDATE:19990101T000000
-TZNAME:KOST
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Kosrae
+X-LIC-LOCATION:Pacific/Kosrae
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:KOST
+TZOFFSETFROM:+105156
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691001T000000
+RDATE:19691001T000000
+TZNAME:KOST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19990101T000000
+RDATE:19990101T000000
+TZNAME:KOST
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kwajalein.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kwajalein.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Kwajalein.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691001T000000
-RDATE:19691001T000000
-TZNAME:KWAT
-TZOFFSETFROM:+1100
-TZOFFSETTO:-1200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19930820T000000
-RDATE:19930820T000000
-TZNAME:MHT
-TZOFFSETFROM:-1200
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Kwajalein
+X-LIC-LOCATION:Pacific/Kwajalein
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:MHT
+TZOFFSETFROM:+110920
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691001T000000
+RDATE:19691001T000000
+TZNAME:KWAT
+TZOFFSETFROM:+1100
+TZOFFSETTO:-1200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19930820T000000
+RDATE:19930820T000000
+TZNAME:MHT
+TZOFFSETFROM:-1200
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Majuro.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Majuro.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Majuro.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691001T000000
-RDATE:19691001T000000
-TZNAME:MHT
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Majuro
+X-LIC-LOCATION:Pacific/Majuro
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:MHT
+TZOFFSETFROM:+112448
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691001T000000
+RDATE:19691001T000000
+TZNAME:MHT
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Marquesas.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Marquesas.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Marquesas.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Marquesas
+X-LIC-LOCATION:Pacific/Marquesas
+BEGIN:STANDARD
+DTSTART:19121001T000000
+RDATE:19121001T000000
+TZNAME:MART
+TZOFFSETFROM:-0918
+TZOFFSETTO:-0930
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Midway.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Midway.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Midway.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19560603T000000
-RDATE:19560603T000000
-TZNAME:NDT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19560902T000000
-RDATE:19560902T000000
-TZNAME:NST
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19670401T000000
-RDATE:19670401T000000
-TZNAME:BST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19831130T000000
-RDATE:19831130T000000
-TZNAME:SST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Midway
+X-LIC-LOCATION:Pacific/Midway
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:NST
+TZOFFSETFROM:-114928
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19560603T000000
+RDATE:19560603T000000
+TZNAME:NDT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19560902T000000
+RDATE:19560902T000000
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19670401T000000
+RDATE:19670401T000000
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+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/Nauru.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Nauru.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Nauru.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420315T000000
-RDATE:19420315T000000
-TZNAME:JST
-TZOFFSETFROM:+1130
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19440815T000000
-RDATE:19440815T000000
-TZNAME:NRT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1130
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19790501T000000
-RDATE:19790501T000000
-TZNAME:NRT
-TZOFFSETFROM:+1130
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Nauru
+X-LIC-LOCATION:Pacific/Nauru
+BEGIN:STANDARD
+DTSTART:19210115T000000
+RDATE:19210115T000000
+TZNAME:NRT
+TZOFFSETFROM:+110740
+TZOFFSETTO:+1130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420315T000000
+RDATE:19420315T000000
+TZNAME:JST
+TZOFFSETFROM:+1130
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19440815T000000
+RDATE:19440815T000000
+TZNAME:NRT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790501T000000
+RDATE:19790501T000000
+TZNAME:NRT
+TZOFFSETFROM:+1130
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Niue.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Niue.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Niue.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19510101T000000
-RDATE:19510101T000000
-TZNAME:NUT
-TZOFFSETFROM:-1120
-TZOFFSETTO:-1130
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19781001T000000
-RDATE:19781001T000000
-TZNAME:NUT
-TZOFFSETFROM:-1130
-TZOFFSETTO:-1100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Niue
+X-LIC-LOCATION:Pacific/Niue
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:NUT
+TZOFFSETFROM:-111940
+TZOFFSETTO:-1120
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:NUT
+TZOFFSETFROM:-1120
+TZOFFSETTO:-1130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19781001T000000
+RDATE:19781001T000000
+TZNAME:NUT
+TZOFFSETFROM:-1130
+TZOFFSETTO:-1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Norfolk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Norfolk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Norfolk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19510101T000000
-RDATE:19510101T000000
-TZNAME:NFT
-TZOFFSETFROM:+1112
-TZOFFSETTO:+1130
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Norfolk
+X-LIC-LOCATION:Pacific/Norfolk
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:NMT
+TZOFFSETFROM:+111152
+TZOFFSETTO:+1112
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19510101T000000
+RDATE:19510101T000000
+TZNAME:NFT
+TZOFFSETFROM:+1112
+TZOFFSETTO:+1130
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Noumea.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Noumea.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Noumea.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,44 +1,44 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19780227T000000
-RRULE:FREQ=YEARLY;UNTIL=19790226T120000Z;BYMONTH=2
-TZNAME:NCT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19961201T020000
-RDATE:19961201T020000
-TZNAME:NCST
-TZOFFSETFROM:+1100
-TZOFFSETTO:+1200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19970302T030000
-RDATE:19970302T030000
-TZNAME:NCT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19780227T000000
+RRULE:FREQ=YEARLY;UNTIL=19790226T120000Z;BYMONTH=2
+TZNAME:NCT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19961201T020000
+RDATE:19961201T020000
+TZNAME:NCST
+TZOFFSETFROM:+1100
+TZOFFSETTO:+1200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19970302T030000
+RDATE:19970302T030000
+TZNAME:NCT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pago_Pago.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pago_Pago.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pago_Pago.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific/Pago_Pago
-X-LIC-LOCATION:Pacific/Pago_Pago
-BEGIN:STANDARD
-DTSTART:19110101T000000
-RDATE:19110101T000000
-TZNAME:SAMT
-TZOFFSETFROM:-112248
-TZOFFSETTO:-1130
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19500101T000000
-RDATE:19500101T000000
-TZNAME:NST
-TZOFFSETFROM:-1130
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19670401T000000
-RDATE:19670401T000000
-TZNAME:BST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19831130T000000
-RDATE:19831130T000000
-TZNAME:SST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Pago_Pago
+X-LIC-LOCATION:Pacific/Pago_Pago
+BEGIN:STANDARD
+DTSTART:19110101T000000
+RDATE:19110101T000000
+TZNAME:SAMT
+TZOFFSETFROM:-112248
+TZOFFSETTO:-1130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:NST
+TZOFFSETFROM:-1130
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19670401T000000
+RDATE:19670401T000000
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Palau.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Palau
+X-LIC-LOCATION:Pacific/Palau
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:PWT
+TZOFFSETFROM:+085756
+TZOFFSETTO:+0900
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pitcairn.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pitcairn.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pitcairn.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19980427T000000
-RDATE:19980427T000000
-TZNAME:PST
-TZOFFSETFROM:-0830
-TZOFFSETTO:-0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Pitcairn
+X-LIC-LOCATION:Pacific/Pitcairn
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:PNT
+TZOFFSETFROM:-084020
+TZOFFSETTO:-0830
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19980427T000000
+RDATE:19980427T000000
+TZNAME:PST
+TZOFFSETFROM:-0830
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pohnpei.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pohnpei.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Pohnpei.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Ponape.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Ponape
+X-LIC-LOCATION:Pacific/Ponape
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:PONT
+TZOFFSETFROM:+103252
+TZOFFSETTO:+1100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Port_Moresby.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Port_Moresby.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Port_Moresby.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,23 +1,23 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:18950101T000000
-RDATE:18950101T000000
-TZNAME:PGT
-TZOFFSETFROM:+094832
-TZOFFSETTO:+1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Port_Moresby
+X-LIC-LOCATION:Pacific/Port_Moresby
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:PMMT
+TZOFFSETFROM:+094840
+TZOFFSETTO:+094832
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:18950101T000000
+RDATE:18950101T000000
+TZNAME:PGT
+TZOFFSETFROM:+094832
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Saipan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Saipan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Saipan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,30 +1,30 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific/Saipan
-X-LIC-LOCATION:Pacific/Saipan
-BEGIN:STANDARD
-DTSTART:19010101T000000
-RDATE:19010101T000000
-TZNAME:MPT
-TZOFFSETFROM:+0943
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19691001T000000
-RDATE:19691001T000000
-TZNAME:MPT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:20001223T000000
-RDATE:20001223T000000
-TZNAME:ChST
-TZOFFSETFROM:+1000
-TZOFFSETTO:+1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Saipan
+X-LIC-LOCATION:Pacific/Saipan
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:MPT
+TZOFFSETFROM:+0943
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19691001T000000
+RDATE:19691001T000000
+TZNAME:MPT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+1000
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Samoa.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific/Samoa
-X-LIC-LOCATION:Pacific/Samoa
-BEGIN:STANDARD
-DTSTART:19110101T000000
-RDATE:19110101T000000
-TZNAME:SAMT
-TZOFFSETFROM:-112248
-TZOFFSETTO:-1130
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19500101T000000
-RDATE:19500101T000000
-TZNAME:NST
-TZOFFSETFROM:-1130
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19670401T000000
-RDATE:19670401T000000
-TZNAME:BST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19831130T000000
-RDATE:19831130T000000
-TZNAME:SST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Samoa
+X-LIC-LOCATION:Pacific/Samoa
+BEGIN:STANDARD
+DTSTART:19110101T000000
+RDATE:19110101T000000
+TZNAME:SAMT
+TZOFFSETFROM:-112248
+TZOFFSETTO:-1130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:NST
+TZOFFSETFROM:-1130
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19670401T000000
+RDATE:19670401T000000
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tahiti.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Tahiti
+X-LIC-LOCATION:Pacific/Tahiti
+BEGIN:STANDARD
+DTSTART:19121001T000000
+RDATE:19121001T000000
+TZNAME:TAHT
+TZOFFSETFROM:-095816
+TZOFFSETTO:-1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tarawa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tarawa.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tarawa.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Tarawa
+X-LIC-LOCATION:Pacific/Tarawa
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:GILT
+TZOFFSETFROM:+113204
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tongatapu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tongatapu.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Tongatapu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,58 +1,58 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific/Tongatapu
-X-LIC-LOCATION:Pacific/Tongatapu
-BEGIN:STANDARD
-DTSTART:19010101T000000
-RDATE:19010101T000000
-TZNAME:TOT
-TZOFFSETFROM:+121920
-TZOFFSETTO:+1220
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410101T000000
-RDATE:19410101T000000
-TZNAME:TOT
-TZOFFSETFROM:+1220
-TZOFFSETTO:+1300
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20010128T020000
-RRULE:FREQ=YEARLY;UNTIL=20020126T120000Z;BYDAY=-1SU;BYMONTH=1
-TZNAME:TOT
-TZOFFSETFROM:+1400
-TZOFFSETTO:+1300
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Tongatapu
+X-LIC-LOCATION:Pacific/Tongatapu
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:TOT
+TZOFFSETFROM:+121920
+TZOFFSETTO:+1220
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410101T000000
+RDATE:19410101T000000
+TZNAME:TOT
+TZOFFSETFROM:+1220
+TZOFFSETTO:+1300
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20010128T020000
+RRULE:FREQ=YEARLY;UNTIL=20020126T120000Z;BYDAY=-1SU;BYMONTH=1
+TZNAME:TOT
+TZOFFSETFROM:+1400
+TZOFFSETTO:+1300
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Truk.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Truk.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Truk.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Truk
+X-LIC-LOCATION:Pacific/Truk
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:CHUT
+TZOFFSETFROM:+100708
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wake.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wake.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wake.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Wake
+X-LIC-LOCATION:Pacific/Wake
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:WAKT
+TZOFFSETFROM:+110628
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wallis.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wallis.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Wallis.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Wallis
+X-LIC-LOCATION:Pacific/Wallis
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:WFT
+TZOFFSETFROM:+121520
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Yap.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Yap.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Pacific/Yap.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +1,16 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Pacific/Yap
+X-LIC-LOCATION:Pacific/Yap
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:CHUT
+TZOFFSETFROM:+100708
+TZOFFSETTO:+1000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Poland.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Poland.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Poland.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,190 +1,190 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T010000
-RDATE:19161001T010000
-RDATE:19170917T030000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441004T020000
-RDATE:19451101T000000
-RDATE:19461007T030000
-RDATE:19770925T020000
-RDATE:19781001T020000
-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:19180916T030000
-RDATE:19180916T030000
-TZNAME:EET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19400623T020000
-RDATE:19400623T020000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19441001T000000
-RDATE:19441001T000000
-TZNAME:CEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0200
-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:19570929T020000
-RRULE:FREQ=YEARLY;UNTIL=19580928T000000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19591004T020000
-RRULE:FREQ=YEARLY;UNTIL=19611001T000000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19610528T010000
-RRULE:FREQ=YEARLY;UNTIL=19640531T000000Z;BYDAY=-1SU;BYMONTH=5
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19620930T020000
-RRULE:FREQ=YEARLY;UNTIL=19640927T000000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19770101T000000
-RDATE:19770101T000000
-RDATE:19880101T000000
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19770403T010000
-RRULE:FREQ=YEARLY;UNTIL=19800406T000000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;UNTIL=19870927T000000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19170917T030000
+RDATE:19421102T030000
+RDATE:19431004T030000
+RDATE:19441004T020000
+RDATE:19451101T000000
+RDATE:19461007T030000
+RDATE:19770925T020000
+RDATE:19781001T020000
+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:19180916T030000
+RDATE:19180916T030000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19400623T020000
+RDATE:19400623T020000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19441001T000000
+RDATE:19441001T000000
+TZNAME:CEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+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:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19591004T020000
+RRULE:FREQ=YEARLY;UNTIL=19611001T000000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19610528T010000
+RRULE:FREQ=YEARLY;UNTIL=19640531T000000Z;BYDAY=-1SU;BYMONTH=5
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19620930T020000
+RRULE:FREQ=YEARLY;UNTIL=19640927T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19770101T000000
+RDATE:19770101T000000
+RDATE:19880101T000000
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19770403T010000
+RRULE:FREQ=YEARLY;UNTIL=19800406T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19870927T000000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Portugal.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Portugal.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Portugal.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,261 +1,262 @@
-BEGIN:VCALENDAR
-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
-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
-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
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19401006T000000
-RRULE:FREQ=YEARLY;UNTIL=19411005T230000Z;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-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
-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
-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
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19470406T020000
-RRULE:FREQ=YEARLY;UNTIL=19490403T020000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;UNTIL=19491002T020000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19510401T020000
-RRULE:FREQ=YEARLY;UNTIL=19650404T020000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19511007T030000
-RRULE:FREQ=YEARLY;UNTIL=19651003T020000Z;BYDAY=1SU;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19660403T020000
-RDATE:19660403T020000
-TZNAME:CET
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19760926T010000
-RDATE:19760926T010000
-TZNAME:WEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19780402T000000
-RRULE:FREQ=YEARLY;UNTIL=19790401T000000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19790930T020000
-RRULE:FREQ=YEARLY;UNTIL=19820926T010000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19810329T010000
-RRULE:FREQ=YEARLY;UNTIL=19820328T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19830925T020000
-RRULE:FREQ=YEARLY;UNTIL=19910929T010000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19840325T010000
-RRULE:FREQ=YEARLY;UNTIL=19920329T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19920927T020000
-RDATE:19920927T020000
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19930328T020000
-RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END: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
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19961027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZNAME:WET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19970330T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZNAME:WEST
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19261003T000000
+RRULE:FREQ=YEARLY;UNTIL=19291005T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19311004T000000
+RRULE:FREQ=YEARLY;UNTIL=19321001T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19341007T000000
+RRULE:FREQ=YEARLY;UNTIL=19381001T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19401006T000000
+RRULE:FREQ=YEARLY;UNTIL=19411005T230000Z;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+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
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19421025T000000
+RRULE:FREQ=YEARLY;UNTIL=19451027T230000Z;BYDAY=SU;BYYEARDAY=-61,-62,-63,-6
+ 4,-65,-66,-67
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19430829T000000
+RRULE:FREQ=YEARLY;UNTIL=19450825T220000Z;BYDAY=SU;BYYEARDAY=-122,-123,-124
+ ,-125,-126,-127,-128
+TZNAME:WEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19470406T020000
+RRULE:FREQ=YEARLY;UNTIL=19490403T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19471005T030000
+RRULE:FREQ=YEARLY;UNTIL=19491002T020000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19510401T020000
+RRULE:FREQ=YEARLY;UNTIL=19650404T020000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19511007T030000
+RRULE:FREQ=YEARLY;UNTIL=19651003T020000Z;BYDAY=1SU;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19660403T020000
+RDATE:19660403T020000
+TZNAME:CET
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19760926T010000
+RDATE:19760926T010000
+TZNAME:WEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19780402T000000
+RRULE:FREQ=YEARLY;UNTIL=19790401T000000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19790930T020000
+RRULE:FREQ=YEARLY;UNTIL=19820926T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19810329T010000
+RRULE:FREQ=YEARLY;UNTIL=19820328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19830925T020000
+RRULE:FREQ=YEARLY;UNTIL=19910929T010000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19840325T010000
+RRULE:FREQ=YEARLY;UNTIL=19920329T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19920927T020000
+RDATE:19920927T020000
+TZNAME:CET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19930328T020000
+RRULE:FREQ=YEARLY;UNTIL=19950326T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+END: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
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19961027T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:WET
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19970330T010000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:WEST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/ROC.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/ROC.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/ROC.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,87 +1,87 @@
-BEGIN:VCALENDAR
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19451001T000000
-RRULE:FREQ=YEARLY;UNTIL=19510930T150000Z;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-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
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19530401T000000
-RRULE:FREQ=YEARLY;UNTIL=19590331T160000Z;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19551001T000000
-RRULE:FREQ=YEARLY;UNTIL=19610930T150000Z;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19600601T000000
-RRULE:FREQ=YEARLY;UNTIL=19610531T160000Z;BYMONTH=6
-TZNAME:CDT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19740401T000000
-RRULE:FREQ=YEARLY;UNTIL=19750331T160000Z;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:+0800
-TZOFFSETTO:+0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19741001T000000
-RRULE:FREQ=YEARLY;UNTIL=19750930T150000Z;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19790930T000000
-RDATE:19790930T000000
-TZNAME:CST
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19451001T000000
+RRULE:FREQ=YEARLY;UNTIL=19510930T150000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+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
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19530401T000000
+RRULE:FREQ=YEARLY;UNTIL=19590331T160000Z;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19551001T000000
+RRULE:FREQ=YEARLY;UNTIL=19610930T150000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19600601T000000
+RRULE:FREQ=YEARLY;UNTIL=19610531T160000Z;BYMONTH=6
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19740401T000000
+RRULE:FREQ=YEARLY;UNTIL=19750331T160000Z;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:+0800
+TZOFFSETTO:+0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19741001T000000
+RRULE:FREQ=YEARLY;UNTIL=19750930T150000Z;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19790930T000000
+RDATE:19790930T000000
+TZNAME:CST
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/ROK.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/ROK.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/ROK.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,68 +1,68 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:ROK
-X-LIC-LOCATION:ROK
-BEGIN:STANDARD
-DTSTART:18900101T000000
-RDATE:18900101T000000
-TZNAME:KST
-TZOFFSETFROM:+082752
-TZOFFSETTO:+0830
-END:STANDARD
-BEGIN:STANDARD
-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
-END:STANDARD
-BEGIN:STANDARD
-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
-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
-TZOFFSETFROM:+1000
-TZOFFSETTO:+0900
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:ROK
+X-LIC-LOCATION:ROK
+BEGIN:STANDARD
+DTSTART:18900101T000000
+RDATE:18900101T000000
+TZNAME:KST
+TZOFFSETFROM:+082752
+TZOFFSETTO:+0830
+END:STANDARD
+BEGIN:STANDARD
+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
+END:STANDARD
+BEGIN:STANDARD
+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
+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
+TZOFFSETFROM:+1000
+TZOFFSETTO:+0900
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Singapore.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Singapore.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Singapore.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,72 +1,72 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19050601T000000
-RDATE:19050601T000000
-TZNAME:MALT
-TZOFFSETFROM:+065525
-TZOFFSETTO:+0700
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19330101T000000
-RDATE:19330101T000000
-TZNAME:MALST
-TZOFFSETFROM:+0700
-TZOFFSETTO:+0720
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19360101T000000
-RDATE:19360101T000000
-TZNAME:MALT
-TZOFFSETFROM:+0720
-TZOFFSETTO:+0720
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19410901T000000
-RDATE:19410901T000000
-TZNAME:MALT
-TZOFFSETFROM:+0720
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420216T000000
-RDATE:19420216T000000
-TZNAME:JST
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0900
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19450912T000000
-RDATE:19450912T000000
-TZNAME:MALT
-TZOFFSETFROM:+0900
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19650809T000000
-RDATE:19650809T000000
-TZNAME:SGT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0730
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19820101T000000
-RDATE:19820101T000000
-TZNAME:SGT
-TZOFFSETFROM:+0730
-TZOFFSETTO:+0800
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Singapore
+X-LIC-LOCATION:Singapore
+BEGIN:STANDARD
+DTSTART:19010101T000000
+RDATE:19010101T000000
+TZNAME:SMT
+TZOFFSETFROM:+065525
+TZOFFSETTO:+065525
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19050601T000000
+RDATE:19050601T000000
+TZNAME:MALT
+TZOFFSETFROM:+065525
+TZOFFSETTO:+0700
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330101T000000
+RDATE:19330101T000000
+TZNAME:MALST
+TZOFFSETFROM:+0700
+TZOFFSETTO:+0720
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19360101T000000
+RDATE:19360101T000000
+TZNAME:MALT
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0720
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19410901T000000
+RDATE:19410901T000000
+TZNAME:MALT
+TZOFFSETFROM:+0720
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420216T000000
+RDATE:19420216T000000
+TZNAME:JST
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0900
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19450912T000000
+RDATE:19450912T000000
+TZNAME:MALT
+TZOFFSETFROM:+0900
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19650809T000000
+RDATE:19650809T000000
+TZNAME:SGT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0730
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19820101T000000
+RDATE:19820101T000000
+TZNAME:SGT
+TZOFFSETFROM:+0730
+TZOFFSETTO:+0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Turkey.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Turkey.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Turkey.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,236 +1,264 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Turkey
-X-LIC-LOCATION:Turkey
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:IMT
-TZOFFSETFROM:+015552
-TZOFFSETTO:+015656
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19101001T000000
-RDATE:19101001T000000
-TZNAME:EEST
-TZOFFSETFROM:+015656
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19160501T000000
-RDATE:19160501T000000
-RDATE:19200328T000000
-RDATE:19210403T000000
-RDATE:19220326T000000
-RDATE:19240513T000000
-RDATE:19250501T000000
-RDATE:19400630T000000
-RDATE:19401201T000000
-RDATE:19420401T000000
-RDATE:19450402T000000
-RDATE:19460601T000000
-RDATE:19490410T000000
-RDATE:19500419T000000
-RDATE:19510422T000000
-RDATE:19620715T000000
-RDATE:19640515T000000
-RDATE:19730603T010000
-RDATE:19740331T020000
-RDATE:19750330T000000
-RDATE:19760601T000000
-TZNAME:EEST
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19161001T000000
-RDATE:19161001T000000
-RDATE:19201025T000000
-RDATE:19211003T000000
-RDATE:19221008T000000
-RDATE:19401005T000000
-RDATE:19410921T000000
-RDATE:19421101T000000
-RDATE:19451008T000000
-RDATE:19461001T000000
-RDATE:19511008T000000
-RDATE:19621008T000000
-RDATE:19641001T000000
-RDATE:19731104T030000
-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:+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
-TZNAME:TRST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19790401T030000
-RDATE:19790401T030000
-TZNAME:TRST
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19791015T000000
-RRULE:FREQ=YEARLY;UNTIL=19821010T200000Z;BYDAY=-3MO;BYMONTH=10
-TZNAME:TRT
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-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: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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:Turkey
+X-LIC-LOCATION:Turkey
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:IMT
+TZOFFSETFROM:+015552
+TZOFFSETTO:+015656
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19101001T000000
+RDATE:19101001T000000
+TZNAME:EEST
+TZOFFSETFROM:+015656
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19160501T000000
+RDATE:19160501T000000
+RDATE:19200328T000000
+RDATE:19210403T000000
+RDATE:19220326T000000
+RDATE:19240513T000000
+RDATE:19250501T000000
+RDATE:19400630T000000
+RDATE:19401201T000000
+RDATE:19420401T000000
+RDATE:19450402T000000
+RDATE:19460601T000000
+RDATE:19490410T000000
+RDATE:19500419T000000
+RDATE:19510422T000000
+RDATE:19620715T000000
+RDATE:19640515T000000
+RDATE:19730603T010000
+RDATE:19740331T020000
+RDATE:19750330T000000
+RDATE:19760601T000000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19161001T000000
+RDATE:19161001T000000
+RDATE:19201025T000000
+RDATE:19211003T000000
+RDATE:19221008T000000
+RDATE:19401005T000000
+RDATE:19410921T000000
+RDATE:19421101T000000
+RDATE:19451008T000000
+RDATE:19461001T000000
+RDATE:19511008T000000
+RDATE:19621008T000000
+RDATE:19641001T000000
+RDATE:19731104T030000
+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:+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
+TZNAME:TRST
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19790401T030000
+RDATE:19790401T030000
+TZNAME:TRST
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19791015T000000
+RRULE:FREQ=YEARLY;UNTIL=19821010T200000Z;BYDAY=-3MO;BYMONTH=10
+TZNAME:TRT
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+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: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
+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;UNTIL=20100328T010000Z;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071028T040000
+RRULE:FREQ=YEARLY;UNTIL=20101031T010000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T030000
+RDATE:20110327T030000
+TZNAME:EET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110328T030000
+RDATE:20110328T030000
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20111030T040000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20120325T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+TZNAME:EEST
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0300
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/UCT.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/UCT.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/UCT.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Alaska.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,137 +1,137 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US/Alaska
-X-LIC-LOCATION:US/Alaska
-BEGIN:STANDARD
-DTSTART:19000820T120000
-RDATE:19000820T120000
-TZNAME:CAT
-TZOFFSETFROM:-095936
-TZOFFSETTO:-1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420101T000000
-RDATE:19420101T000000
-TZNAME:CAT/CAWT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:CAT/CAWT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-0900
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T140000
-RDATE:19450814T140000
-TZNAME:CAT/CAPT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-0900
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:CAT/CAPT
-TZOFFSETFROM:-0900
-TZOFFSETTO:-1000
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-TZNAME:CAT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:US/Alaska
+X-LIC-LOCATION:US/Alaska
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:CAT
+TZOFFSETFROM:-095936
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+TZNAME:CAT/CAWT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:CAT/CAWT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T140000
+RDATE:19450814T140000
+TZNAME:CAT/CAPT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-0900
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:CAT/CAPT
+TZOFFSETFROM:-0900
+TZOFFSETTO:-1000
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+TZNAME:CAT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Aleutian.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,131 +1,131 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US/Aleutian
-X-LIC-LOCATION:US/Aleutian
-BEGIN:STANDARD
-DTSTART:19000820T120000
-RDATE:19000820T120000
-TZNAME:NST
-TZOFFSETFROM:-114638
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19420101T000000
-RDATE:19420101T000000
-RDATE:19460101T000000
-TZNAME:NST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-TZNAME:NWT
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T130000
-RDATE:19450814T130000
-TZNAME:NPT
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1000
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-TZNAME:NST
-TZOFFSETFROM:-1000
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-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
-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
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:US/Aleutian
+X-LIC-LOCATION:US/Aleutian
+BEGIN:STANDARD
+DTSTART:19000820T120000
+RDATE:19000820T120000
+TZNAME:NST
+TZOFFSETFROM:-114638
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19420101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+TZNAME:NST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:NWT
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T130000
+RDATE:19450814T130000
+TZNAME:NPT
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1000
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+TZNAME:NST
+TZOFFSETFROM:-1000
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Arizona.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,68 +1,68 @@
-BEGIN:VCALENDAR
-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
-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:STANDARD
-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:-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
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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:STANDARD
+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:-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
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/US/Central.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Central.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Central.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,177 +1,177 @@
-BEGIN:VCALENDAR
-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
-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
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19200613T020000
-RDATE:19200613T020000
-RDATE:19210327T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T020000
-RRULE:FREQ=YEARLY;UNTIL=19211030T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19220430T020000
-RRULE:FREQ=YEARLY;UNTIL=19350428T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19370926T020000
-RRULE:FREQ=YEARLY;UNTIL=19410928T070000Z;BYDAY=-1SU;BYMONTH=9
-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:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-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:19551030T020000
-RRULE:FREQ=YEARLY;UNTIL=19661030T070000Z;BYDAY=-1SU;BYMONTH=10
-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: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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19200613T020000
+RDATE:19200613T020000
+RDATE:19210327T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T020000
+RRULE:FREQ=YEARLY;UNTIL=19211030T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19220430T020000
+RRULE:FREQ=YEARLY;UNTIL=19350428T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19370926T020000
+RRULE:FREQ=YEARLY;UNTIL=19410928T070000Z;BYDAY=-1SU;BYMONTH=9
+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:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+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:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T070000Z;BYDAY=-1SU;BYMONTH=10
+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: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/US/East-Indiana.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/East-Indiana.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/East-Indiana.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,142 +1,142 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US/East-Indiana
-X-LIC-LOCATION:US/East-Indiana
-BEGIN:STANDARD
-DTSTART:18831118T121522
-RDATE:18831118T121522
-TZNAME:CST
-TZOFFSETFROM:-054438
-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: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
-END:DAYLIGHT
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-TZNAME:CPT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-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
-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
-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
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:US/East-Indiana
+X-LIC-LOCATION:US/East-Indiana
+BEGIN:STANDARD
+DTSTART:18831118T121522
+RDATE:18831118T121522
+TZNAME:CST
+TZOFFSETFROM:-054438
+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: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
+END:DAYLIGHT
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+TZNAME:CPT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19540425T080000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+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
+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
+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
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Eastern.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,148 +1,148 @@
-BEGIN:VCALENDAR
-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
-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
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19200328T020000
-RDATE:19200328T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T020000
-RDATE:19201031T020000
-RDATE:19450930T020000
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19210424T020000
-RRULE:FREQ=YEARLY;UNTIL=19410427T070000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19210925T020000
-RRULE:FREQ=YEARLY;UNTIL=19410928T060000Z;BYDAY=-1SU;BYMONTH=9
-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:DAYLIGHT
-DTSTART:19460428T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T070000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:EDT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19460929T020000
-RRULE:FREQ=YEARLY;UNTIL=19540926T060000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19551030T020000
-RRULE:FREQ=YEARLY;UNTIL=19661030T060000Z;BYDAY=-1SU;BYMONTH=10
-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: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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19200328T020000
+RDATE:19200328T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19450930T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19210424T020000
+RRULE:FREQ=YEARLY;UNTIL=19410427T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;UNTIL=19410928T060000Z;BYDAY=-1SU;BYMONTH=9
+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:DAYLIGHT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T070000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;UNTIL=19540926T060000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T060000Z;BYDAY=-1SU;BYMONTH=10
+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: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/Hawaii.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Hawaii.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Hawaii.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,39 +1,39 @@
-BEGIN:VCALENDAR
-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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19330430T020000
-RDATE:19330430T020000
-RDATE:19420209T020000
-TZNAME:HDT
-TZOFFSETFROM:-1030
-TZOFFSETTO:-0930
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19330521T120000
-RDATE:19330521T120000
-RDATE:19450930T020000
-TZNAME:HST
-TZOFFSETFROM:-0930
-TZOFFSETTO:-1030
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19470608T020000
-RDATE:19470608T020000
-TZNAME:HST
-TZOFFSETFROM:-1030
-TZOFFSETTO:-1000
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:US/Hawaii
+X-LIC-LOCATION:US/Hawaii
+BEGIN:STANDARD
+DTSTART:18960113T120000
+RDATE:18960113T120000
+TZNAME:HST
+TZOFFSETFROM:-103126
+TZOFFSETTO:-1030
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330430T020000
+RDATE:19330430T020000
+RDATE:19420209T020000
+TZNAME:HDT
+TZOFFSETFROM:-1030
+TZOFFSETTO:-0930
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19330521T120000
+RDATE:19330521T120000
+RDATE:19450930T020000
+TZNAME:HST
+TZOFFSETFROM:-0930
+TZOFFSETTO:-1030
+END:STANDARD
+BEGIN:STANDARD
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Indiana-Starke.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,166 +1,166 @@
-BEGIN:VCALENDAR
-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
-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
-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;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
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19570929T020000
-RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19591025T020000
-RRULE:FREQ=YEARLY;UNTIL=19611029T070000Z;BYDAY=-1SU;BYMONTH=10
-TZNAME:CST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;UNTIL=19901028T070000Z;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=19910407T080000Z;BYDAY=1SU;BYMONTH=4
-TZNAME:CDT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19911027T020000
-RDATE:19911027T020000
-TZNAME:EST
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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;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
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19570929T020000
+RRULE:FREQ=YEARLY;UNTIL=19580928T070000Z;BYDAY=-1SU;BYMONTH=9
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19591025T020000
+RRULE:FREQ=YEARLY;UNTIL=19611029T070000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=19901028T070000Z;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=19910407T080000Z;BYDAY=1SU;BYMONTH=4
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19911027T020000
+RDATE:19911027T020000
+TZNAME:EST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+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/US/Michigan.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Michigan.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Michigan.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,115 +1,115 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US/Michigan
-X-LIC-LOCATION:US/Michigan
-BEGIN:STANDARD
-DTSTART:19050101T000000
-RDATE:19050101T000000
-TZNAME:CST
-TZOFFSETFROM:-053211
-TZOFFSETTO:-0600
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19150515T020000
-RDATE:19150515T020000
-TZNAME:EST
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:STANDARD
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19450814T190000
-RDATE:19450814T190000
-TZNAME:EPT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19450930T020000
-RDATE:19450930T020000
-RDATE:19480926T020000
-RDATE:19671029T020000
-TZNAME:EST
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:US/Michigan
+X-LIC-LOCATION:US/Michigan
+BEGIN:STANDARD
+DTSTART:19050101T000000
+RDATE:19050101T000000
+TZNAME:CST
+TZOFFSETFROM:-053211
+TZOFFSETTO:-0600
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19150515T020000
+RDATE:19150515T020000
+TZNAME:EST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:STANDARD
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+TZNAME:EPT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19480926T020000
+RDATE:19671029T020000
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Mountain.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,134 +1,134 @@
-BEGIN:VCALENDAR
-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
-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
-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
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19201031T020000
-RDATE:19201031T020000
-RDATE:19210522T020000
-RDATE:19450930T020000
-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:DAYLIGHT
-DTSTART:19650425T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:MDT
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0600
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19651031T020000
-RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+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
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19201031T020000
+RDATE:19201031T020000
+RDATE:19210522T020000
+RDATE:19450930T020000
+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:DAYLIGHT
+DTSTART:19650425T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19651031T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T080000Z;BYDAY=-1SU;BYMONTH=10
+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/US/Pacific.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Pacific.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Pacific.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,132 +1,132 @@
-BEGIN:VCALENDAR
-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
-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
-RDATE:19490101T020000
-TZNAME:PST
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19460101T000000
-RDATE:19460101T000000
-RDATE:19670101T000000
-TZNAME:PST
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0800
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19480314T020000
-RDATE:19480314T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19500430T020000
-RRULE:FREQ=YEARLY;UNTIL=19660424T100000Z;BYDAY=-1SU;BYMONTH=4
-TZNAME:PDT
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19500924T020000
-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=19661030T090000Z;BYDAY=-1SU;BYMONTH=10
-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: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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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
+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
+RDATE:19490101T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19480314T020000
+RDATE:19480314T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19500430T020000
+RRULE:FREQ=YEARLY;UNTIL=19660424T100000Z;BYDAY=-1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19500924T020000
+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=19661030T090000Z;BYDAY=-1SU;BYMONTH=10
+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: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/US/Samoa.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/US/Samoa.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/US/Samoa.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,37 +1,37 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US/Samoa
-X-LIC-LOCATION:US/Samoa
-BEGIN:STANDARD
-DTSTART:19110101T000000
-RDATE:19110101T000000
-TZNAME:SAMT
-TZOFFSETFROM:-112248
-TZOFFSETTO:-1130
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19500101T000000
-RDATE:19500101T000000
-TZNAME:NST
-TZOFFSETFROM:-1130
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19670401T000000
-RDATE:19670401T000000
-TZNAME:BST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19831130T000000
-RDATE:19831130T000000
-TZNAME:SST
-TZOFFSETFROM:-1100
-TZOFFSETTO:-1100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:US/Samoa
+X-LIC-LOCATION:US/Samoa
+BEGIN:STANDARD
+DTSTART:19110101T000000
+RDATE:19110101T000000
+TZNAME:SAMT
+TZOFFSETFROM:-112248
+TZOFFSETTO:-1130
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19500101T000000
+RDATE:19500101T000000
+TZNAME:NST
+TZOFFSETFROM:-1130
+TZOFFSETTO:-1100
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19670401T000000
+RDATE:19670401T000000
+TZNAME:BST
+TZOFFSETFROM:-1100
+TZOFFSETTO:-1100
+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/UTC.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/UTC.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/UTC.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Universal.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Universal.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Universal.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/W-SU.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,168 +1,175 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//calendarserver.org//Zonal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:W-SU
-X-LIC-LOCATION:W-SU
-BEGIN:STANDARD
-DTSTART:18800101T000000
-RDATE:18800101T000000
-TZNAME:MMT
-TZOFFSETFROM:+023020
-TZOFFSETTO:+0230
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19160703T000000
-RDATE:19160703T000000
-TZNAME:S
-TZOFFSETFROM:+0230
-TZOFFSETTO:+023048
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19170701T230000
-RDATE:19170701T230000
-TZNAME:MST
-TZOFFSETFROM:+023048
-TZOFFSETTO:+033048
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19171228T000000
-RDATE:19171228T000000
-TZNAME:MMT
-TZOFFSETFROM:+033048
-TZOFFSETTO:+023048
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19180531T220000
-RDATE:19180531T220000
-TZNAME:MDST
-TZOFFSETFROM:+023048
-TZOFFSETTO:+043048
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19180916T010000
-RDATE:19180916T010000
-TZNAME:MST
-TZOFFSETFROM:+043048
-TZOFFSETTO:+033048
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19190531T230000
-RDATE:19190531T230000
-TZNAME:MDST
-TZOFFSETFROM:+033048
-TZOFFSETTO:+043048
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19190701T020000
-RDATE:19190701T020000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+043048
-TZOFFSETTO:+0400
-END:STANDARD
-BEGIN:STANDARD
-DTSTART:19190816T000000
-RDATE:19190816T000000
-RDATE:19211001T000000
-RDATE:19920926T230000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0400
-TZOFFSETTO:+0300
-END:STANDARD
-BEGIN:DAYLIGHT
-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
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19210901T000000
-RDATE:19210901T000000
-TZNAME:MSK/MSD
-TZOFFSETFROM:+0500
-TZOFFSETTO:+0400
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:19221001T000000
-RDATE:19221001T000000
-RDATE:19910929T030000
-TZNAME:EET
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-END:STANDARD
-BEGIN:STANDARD
-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
-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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+BEGIN:VTIMEZONE
+TZID:W-SU
+X-LIC-LOCATION:W-SU
+BEGIN:STANDARD
+DTSTART:18800101T000000
+RDATE:18800101T000000
+TZNAME:MMT
+TZOFFSETFROM:+023020
+TZOFFSETTO:+0230
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19160703T000000
+RDATE:19160703T000000
+TZNAME:S
+TZOFFSETFROM:+0230
+TZOFFSETTO:+023048
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19170701T230000
+RDATE:19170701T230000
+TZNAME:MST
+TZOFFSETFROM:+023048
+TZOFFSETTO:+033048
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19171228T000000
+RDATE:19171228T000000
+TZNAME:MMT
+TZOFFSETFROM:+033048
+TZOFFSETTO:+023048
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180531T220000
+RDATE:19180531T220000
+TZNAME:MDST
+TZOFFSETFROM:+023048
+TZOFFSETTO:+043048
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19180916T010000
+RDATE:19180916T010000
+TZNAME:MST
+TZOFFSETFROM:+043048
+TZOFFSETTO:+033048
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19190531T230000
+RDATE:19190531T230000
+TZNAME:MDST
+TZOFFSETFROM:+033048
+TZOFFSETTO:+043048
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19190701T020000
+RDATE:19190701T020000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+043048
+TZOFFSETTO:+0400
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19190816T000000
+RDATE:19190816T000000
+RDATE:19211001T000000
+RDATE:19920926T230000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:DAYLIGHT
+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
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19210901T000000
+RDATE:19210901T000000
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0500
+TZOFFSETTO:+0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19221001T000000
+RDATE:19221001T000000
+RDATE:19910929T030000
+TZNAME:EET
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0200
+END:STANDARD
+BEGIN:STANDARD
+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
+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;UNTIL=20100327T230000Z;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;UNTIL=20101030T230000Z;BYDAY=-1SU;BYMONTH=10
+TZNAME:MSK/MSD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:20110327T020000
+RDATE:20110327T020000
+TZNAME:MSK
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/WET.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/WET.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/WET.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,52 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/Zulu.ics
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/Zulu.ics	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/Zulu.ics	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1,16 +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
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//calendarserver.org//Zonal//EN
+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/links.txt
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/links.txt	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/links.txt	2011-10-06 11:06:10 UTC (rev 8149)
@@ -33,11 +33,12 @@
 America/Jujuy	America/Argentina/Jujuy
 America/Cordoba	America/Argentina/Cordoba
 Europe/Skopje	Europe/Belgrade
+America/Kralendijk	America/Curacao
 Australia/Tasmania	Australia/Hobart
 Europe/Jersey	Europe/London
 Europe/Nicosia	Asia/Nicosia
 Asia/Macao	Asia/Macau
-Eire	Europe/Dublin
+Australia/Canberra	Australia/Sydney
 ROK	Asia/Seoul
 US/Hawaii	Pacific/Honolulu
 Asia/Ujung_Pandang	Asia/Makassar
@@ -69,6 +70,7 @@
 Kwajalein	Pacific/Kwajalein
 Australia/Yancowinna	Australia/Broken_Hill
 America/Marigot	America/Guadeloupe
+America/Lower_Princes	America/Curacao
 Greenwich	Etc/GMT
 America/Mendoza	America/Argentina/Mendoza
 Asia/Dacca	Asia/Dhaka
@@ -119,7 +121,7 @@
 Africa/Timbuktu	Africa/Bamako
 UTC	Etc/UTC
 Mexico/BajaNorte	America/Tijuana
-Australia/Canberra	Australia/Sydney
+Eire	Europe/Dublin
 Europe/Zagreb	Europe/Belgrade
 Europe/Belfast	Europe/London
 Brazil/West	America/Manaus

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/timezones.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/timezones.xml	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/timezones.xml	2011-10-06 11:06:10 UTC (rev 8149)
@@ -2,1947 +2,1979 @@
 <!DOCTYPE timezones SYSTEM "timezones.dtd">
 
 <timezones>
-  <dtstamp>20110524T222343Z</dtstamp>
+  <dtstamp>2011-10-05T11:50:21Z</dtstamp>
   <timezone>
     <tzid>Africa/Abidjan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0fcf05e48d7a36e6f99b0ccf127acf05</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>dc9468decb9742f08bafcd6d65a50f32</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Accra</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5b122005ea7053af7128646e10e386e9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b8ccb06b2506954bb7a44aab22c51c77</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Addis_Ababa</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>98d0ae0479c533434b42e559cb5aa969</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c9234d83755971b0f7723f588fbea74b</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Algiers</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1b81eb50a949c36bf56da7c422b074fc</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f240a1491a11a31075b0c82ca7c49d04</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Asmara</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Africa/Asmera</alias>
-    <md5>008462a5d69e7f36667ff243a8c12d4a</md5>
+    <md5>44f78e1256485756d3b171a7b3c9440a</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Asmera</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d6969bf3236ba061d39d1c353c86e5c6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>bfa1d6f0cc8e1895614300ce0fcb1722</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Bamako</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Africa/Timbuktu</alias>
-    <md5>0fbb4cea7867d343edc63e473f3cb31f</md5>
+    <md5>36c24c8559ca140fcd5caab5f818f3ef</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Bangui</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>cbe8342b0479cdb8f486aca13eb56d75</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9a0f306cd8a4057dff71d29e067ca809</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Banjul</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>fb9af78ae09a763d1a864f74aa61f14f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2d075b945749ad66ad0752c266832782</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Bissau</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a45f2cb081f69be295d57f37c3e21c58</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f5cb6a8bbcb51d9fd01fe4068ad7f695</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Blantyre</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4090f0bc0ebca23d542b2a14ae259877</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>00bb2539a1e42a31e952eef31caa4661</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Brazzaville</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b8c4a6d0df9e1e125321edf3a36bbfea</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1f60c637e189c8777a9e0e7d1d22cfeb</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Bujumbura</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>edfab88164558e23b5860b0180445672</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3cdc5d3e03e30eb547c744a779a3c4c0</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Cairo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Egypt</alias>
-    <md5>303628a1b15934d89c65236b214d5ef1</md5>
+    <md5>980126ac8c359826ee19b69882ca8e50</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Casablanca</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>807ef6d6bfcb4b8c82ea3b6930092b03</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d29bdf449d5696876b3d081a7cc9d97a</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Ceuta</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b7a453375ad3bc01e66127013467fef5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9ab21c1136add174dd009d88538315cc</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Conakry</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d9fa87e17b785562f7f6791afdc2f896</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>dc03ad3587d98adc83d2e454fc8c4e5e</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Dakar</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bcab3d81c32f9a38677544cf8eea6cb1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a5e281f47227c240805e0f0cfd4911ea</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Dar_es_Salaam</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>144461fadf38879a137acb180d577046</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b4943937a1c88fc9f7995d1563eada11</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Djibouti</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>df8f9f5b5519df56f95d84bbb3888b73</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d18c2e4b68deae8e65e8aff4703d3776</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Douala</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>168bceefa704a63b7c2e962a32da15b3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>126f13183a2adbea15907b7c4c0b4aaa</md5>
   </timezone>
   <timezone>
     <tzid>Africa/El_Aaiun</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6bff529e2345232c0797cb6d700de9eb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>494500808e8542fd83e4706654c43545</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Freetown</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d2f77ae19cf07a10dd3f9f741cf930ac</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>04bb2c81c6cff903bc5f3a9223acc1e3</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Gaborone</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ba0254f317a0b0535490c712b020534e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>89131ae04058f5a2efd3f0c038c10b32</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Harare</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6ccb1f2a4e632a447df8ad2bfe4d4a06</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b1650f9d08a5950ec5fcc187ac661b10</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Johannesburg</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f6802d899b5695b447ba598dd1504040</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a39046b0f33a7af0af58c951b8766453</md5>
   </timezone>
   <timezone>
+    <tzid>Africa/Juba</tzid>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2cecec633d0950df56d2022393afdfdb</md5>
+  </timezone>
+  <timezone>
     <tzid>Africa/Kampala</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>867a67e59780ff3091afea520ad29648</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0a8e97a4644a204f7dfcffe5faf3eca7</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Khartoum</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>728c7aad82c6a4ff7df077905ecb9fd7</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e4a944da17c50b3e031e19dee17bec58</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Kigali</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8f0b1985803bda290999f6039493bcc3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d0d7f2f150f0355d62f3db04f380972c</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Kinshasa</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2c2fff072133754a5fdc928763c001e4</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f5a4143d7731d54aec64b4d2933f7111</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Lagos</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7d2904f2dd1d2841c6f107f5c4db4387</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c22edde6ebc4dc407706841c17665286</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Libreville</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d4c99bfd201d9594675595ac87699bf1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>96847710c6f68dbc50e1051c3b199a1f</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Lome</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>214d7d2fe79686bb7c77f27c7b49edca</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>657a384ba6b08c900645d99d21928f5f</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Luanda</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a66c4cb806fc68fb3b71bcac8521e68e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b553888dbbdba24294ed7f544146a9a0</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Lubumbashi</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3edcaddf532595f14f48f03304c6f9e7</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a680c06cc01dcb11f4eb02319d917a89</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Lusaka</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c0954c9c3a470bc3a32f696d0af411a0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>74cd00ea97b6d6dd02bb07bfe6c573d2</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Malabo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>46315c4f896cfa72e9d17cd53434cb51</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d9b48a59cff1b560f97ae2af9e06af43</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Maputo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>dcf772ef78be810e2f25e556d812b0da</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6c35a7afdba6a160615bebaea9ff5da2</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Maseru</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bf538a98f8f0ec9520ee76acea669040</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5930187b8a65c419445b16ef81aa53c5</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Mbabane</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bff6ce865b01857423c6a1019c98b744</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>85389210a6eee92c0fb08eb1f4dcd652</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Mogadishu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1372052d8814730798c2e05d0113af41</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e2ca770bc74c8d3bc98df62584852f6d</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Monrovia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>989f40756a0d6bf894733dbceeafede5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>25533dd1589bdadfc4880d3e8add92a3</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Nairobi</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e3874408ce87ac7ee2082cb3b953e1d5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0f834f9942a32756fcf3ecb8bcfd6459</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Ndjamena</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2f07ce43a48854996ddbcd86eab687b0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e42e7efb8890f61982baf81521cf9868</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Niamey</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>66721856ee219a64bc7d24f501acd20d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9e9ae84e637cf9c76702c276f7bb5f7e</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Nouakchott</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>93ee884b82837b957f7fa6134286af82</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4ff77ed24d7a670bff2bcbc68d6c0386</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Ouagadougou</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>eb188aeb9b64eb470bf5d2f0bf823b3e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2739667ed4d639130dc5a8448cec220a</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Porto-Novo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>18851af5e4bc5b483a30e78201aafd2f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>051684d374e00423fb0b98909361cf0e</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Sao_Tome</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>dc3c3befd8d22a744757778db6af8d8a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>64891151395186aa0e9d998be5258075</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Timbuktu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>776e14e3bcf1653254111adfa4230aa2</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7b774241c34b5f1404a886b5d25de274</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Tripoli</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Libya</alias>
-    <md5>07ce9436455949eab6e53bf750ba726e</md5>
+    <md5>056c3dc247ee9ebca73a671524fc4617</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Tunis</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>dde6e185317319134d961ab1abf0bee7</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ae5e2a52ff491ba9e6b867a0a1290503</md5>
   </timezone>
   <timezone>
     <tzid>Africa/Windhoek</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>be23afeacad3051b4ceda0a205010326</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f289f3354d98138b5946f174a4f6048c</md5>
   </timezone>
   <timezone>
     <tzid>America/Adak</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Atka</alias>
     <alias>US/Aleutian</alias>
-    <md5>88197e1ab2d6434581dadc577d1fe676</md5>
+    <md5>052d205780da0a75457acf62f87e183e</md5>
   </timezone>
   <timezone>
     <tzid>America/Anchorage</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>US/Alaska</alias>
-    <md5>4045943bac76495d07cbf1e5a980208f</md5>
+    <md5>de9f2f0cfb6cf0265a48f3edf1dbfc8d</md5>
   </timezone>
   <timezone>
     <tzid>America/Anguilla</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>687cbf868c6b12e10c51ef407a390cf7</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3a0d92a114885c5ee40e6b4115e7d144</md5>
   </timezone>
   <timezone>
     <tzid>America/Antigua</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b4cce7c9da9c13f23719d6b45c38316f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8edd393d02001da1bd38a7db63cc1922</md5>
   </timezone>
   <timezone>
     <tzid>America/Araguaina</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b84dda238314659b3a16971733d8ba36</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4c7d123f689678a9f8e694de612bf465</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/Buenos_Aires</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Buenos_Aires</alias>
-    <md5>6e4aacdd8790f88716470cd84aac7426</md5>
+    <md5>7c55847413ff40afee023ac108321bea</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/Catamarca</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Argentina/ComodRivadavia</alias>
     <alias>America/Catamarca</alias>
-    <md5>63178ac98e79386ed9dc99b7b3f4e9b7</md5>
+    <md5>dd84a9f20039849d4eebde7a31810088</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/ComodRivadavia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d28191983cf0bd57dead07e33ab113f1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>fa2eb8a113b960f8cce869f5c1071447</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/Cordoba</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Cordoba</alias>
     <alias>America/Rosario</alias>
-    <md5>86bc9fa178cfcb8a3e96415c93d4bfe0</md5>
+    <md5>1d379d81a3291f80320ed92e14782fd1</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/Jujuy</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Jujuy</alias>
-    <md5>5a9335b53eed5eb4b39fc62fa9326f7a</md5>
+    <md5>0dc8dcd87ba6a1c38b05ee148a50e343</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/La_Rioja</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f20c2176753855ab917c5010767d7e77</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>072849b2122b5f800ee7e223e063fe9d</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/Mendoza</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Mendoza</alias>
-    <md5>9adeea740fdebaa6ab19b3618c3f826b</md5>
+    <md5>96329a35a49f4d40ab3b042a31e2e8eb</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/Rio_Gallegos</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a83b3a1cc070744b030d6a44a019b8bf</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f8212b076682790a8b5701ad9b92aa1e</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/Salta</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>11fc6d584e894a7036101fa3cead7d2b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d957cf76d4b39892fde6830c4b9fb33b</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/San_Juan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>214e46795aacd0a5c8c6fd5397d4967d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>72a2df029cb4ba82764930b0dd7df0a9</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/San_Luis</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9e98700a6f7e9e9697e972e57cce6991</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>783baf3a55ec90ab162cb47c3fd07121</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/Tucuman</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d8e7f19248d91f2a44c62fbcf092aff5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>97cc8fdae1643797c2823cd898b49198</md5>
   </timezone>
   <timezone>
     <tzid>America/Argentina/Ushuaia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3c4c40d3f2e17062e4c572d1d722b762</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e03471715d0072273e2cbee3e0711a26</md5>
   </timezone>
   <timezone>
     <tzid>America/Aruba</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>08e321eadf83a0d5d08feb2f8492591d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>473119154a575c5de70495c9082565f2</md5>
   </timezone>
   <timezone>
     <tzid>America/Asuncion</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>774e58420bb30828098c8f2e26a60b3e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d3b6adbc83b6a15a3be6d93e4cf61585</md5>
   </timezone>
   <timezone>
     <tzid>America/Atikokan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Coral_Harbour</alias>
-    <md5>129dead78651811d3745c820fba72cfb</md5>
+    <md5>e2eb597046bbddc0d6d659d20872e4f2</md5>
   </timezone>
   <timezone>
     <tzid>America/Atka</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c2dd02409b639ad69b2a8eee12ec6d0b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e774d482c768b93f14f3af6a2d91214b</md5>
   </timezone>
   <timezone>
     <tzid>America/Bahia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>32755285c8e0775179e3ca12b896122e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9c3e1760594f4ebebb619b7a86101eaf</md5>
   </timezone>
   <timezone>
     <tzid>America/Bahia_Banderas</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>29c32e9e20e5acbc7285994503e58ead</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d53625addc530467068358fe5596516c</md5>
   </timezone>
   <timezone>
     <tzid>America/Barbados</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>aea469a179590023606cedf8fd211dad</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1466e8535d6daf50d390932688c49f4a</md5>
   </timezone>
   <timezone>
     <tzid>America/Belem</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>76dd0eb2e455786c76322ea471c82356</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7ee3514e27ffe92a6d7979d716e1d426</md5>
   </timezone>
   <timezone>
     <tzid>America/Belize</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6c33d2d0b6b595e0f64db176e7b5b147</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9ee73b369b676485e500a55ddbbde08a</md5>
   </timezone>
   <timezone>
     <tzid>America/Blanc-Sablon</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>78c833c646fe05d7ddc3b545b895b453</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>243c5f9deb930e838a0ee345abcb19b2</md5>
   </timezone>
   <timezone>
     <tzid>America/Boa_Vista</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8ed43179497419109543893baddcd819</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a55f4d01f1828bebb23ca192e79e37b8</md5>
   </timezone>
   <timezone>
     <tzid>America/Bogota</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0d3afa42de84aaa4b1fe67bad7feb0a9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2c1cbae13e8e6313af9f84f79fc2a984</md5>
   </timezone>
   <timezone>
     <tzid>America/Boise</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8781a79edbfc1ac61e7b8731f4294a35</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0652f8de49b9826df860c64ef010c955</md5>
   </timezone>
   <timezone>
     <tzid>America/Buenos_Aires</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7e7edd686d32a75090f5e07a98a529d5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8814f42968145e742683596ed2951683</md5>
   </timezone>
   <timezone>
     <tzid>America/Cambridge_Bay</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c27fbb6abb8f3b982df0c0d68eb6a658</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>de9bb35f5cf6cdde3795858d341177f4</md5>
   </timezone>
   <timezone>
     <tzid>America/Campo_Grande</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>43b8c58d3937c7d1e545bc3b90110da9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>91f40ed32ffd45cccab772c911e16e8b</md5>
   </timezone>
   <timezone>
     <tzid>America/Cancun</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>063210c9c8d70f2868637c12410c3578</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4f57ae0acb5b7414d0481cb6e0615489</md5>
   </timezone>
   <timezone>
     <tzid>America/Caracas</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d4159627744e51e6f71d0a546e2588f3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6a4df646dbe97d59022ea0aad3da0e48</md5>
   </timezone>
   <timezone>
     <tzid>America/Catamarca</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4695f5d57964a61843e5f3e2362df39d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3205d1483722193e1bd9b9cf62c0f898</md5>
   </timezone>
   <timezone>
     <tzid>America/Cayenne</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>300cdcbc3a351f82443864a74be2540c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>298d74a0126387086229e0e55f0d4ef3</md5>
   </timezone>
   <timezone>
     <tzid>America/Cayman</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>08ac4be77e2bad55db61bff1dbfd7662</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>07ca09e17378e117aac517b98ef07824</md5>
   </timezone>
   <timezone>
     <tzid>America/Chicago</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>US/Central</alias>
-    <md5>d2472c1a90094942dc907c11399bd593</md5>
+    <md5>afaa6e4df36635addbf6aafbf639a99d</md5>
   </timezone>
   <timezone>
     <tzid>America/Chihuahua</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>73c3882a58b5497c83099130a4035ca6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>43622e982e100ca20b06991c4f938b50</md5>
   </timezone>
   <timezone>
     <tzid>America/Coral_Harbour</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1385660407294496fb5b46d8fab8d77b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d9de6470e1760f70b213b5a1a1e4a9ff</md5>
   </timezone>
   <timezone>
     <tzid>America/Cordoba</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>38dc0e5786839e93bf0fbf5c4d5941a1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9608ec583432097731b31738d2279a88</md5>
   </timezone>
   <timezone>
     <tzid>America/Costa_Rica</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>96111388fda324f3c1a9b6fc06b524d6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1470dc0c22e8fba3c9ca462c6f617261</md5>
   </timezone>
   <timezone>
     <tzid>America/Cuiaba</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>95d95935d3f5fb2a946767d65e2cfda0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>24241f96742ae0d523dcfee27804d382</md5>
   </timezone>
   <timezone>
     <tzid>America/Curacao</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ff9d225c499f36ba2f333fc65eae936f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <alias>America/Kralendijk</alias>
+    <alias>America/Lower_Princes</alias>
+    <md5>3f298c5d0125051e96413376fb92476f</md5>
   </timezone>
   <timezone>
     <tzid>America/Danmarkshavn</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5f46e7416701c9734215a0ab7f7a0dbd</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a3175f6b91cc5ebe8c2a2b1f500930e5</md5>
   </timezone>
   <timezone>
     <tzid>America/Dawson</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>95023b66c8ea2c455093094bb5ed69a2</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>92cc3b9eb6940bc656e130ef8d464b58</md5>
   </timezone>
   <timezone>
     <tzid>America/Dawson_Creek</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>556674734541cebc5c0d047bfd5f682f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4a29d5a3ff159aca495868f7f5b6157e</md5>
   </timezone>
   <timezone>
     <tzid>America/Denver</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>US/Mountain</alias>
     <alias>America/Shiprock</alias>
     <alias>Navajo</alias>
-    <md5>59328ae6483fe7489da7c343fee2463d</md5>
+    <md5>436e14808b14901d516be96a6cb63709</md5>
   </timezone>
   <timezone>
     <tzid>America/Detroit</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>US/Michigan</alias>
-    <md5>ea8dc7e7951dd0620ea3322116382e87</md5>
+    <md5>719084f02512fb7f86556c25d8c45b01</md5>
   </timezone>
   <timezone>
     <tzid>America/Dominica</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5176a0dd76b1bd16d6a19d1f1c3da99e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>86c1ba04b479911b0cf0aa917a76e3fd</md5>
   </timezone>
   <timezone>
     <tzid>America/Edmonton</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Canada/Mountain</alias>
-    <md5>8fb9d50bac48b2eb5787148125020a39</md5>
+    <md5>6978cb66f7b47e195a540c934bafa4b5</md5>
   </timezone>
   <timezone>
     <tzid>America/Eirunepe</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5c82e3d7242c086a5df5ed76196f4918</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d3c4df84162ebac445e1c2dcdb81f3b2</md5>
   </timezone>
   <timezone>
     <tzid>America/El_Salvador</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>13c9b18527916dd09b18bb930ff89179</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>15a3874396ce8d309deb8e28f76126f6</md5>
   </timezone>
   <timezone>
     <tzid>America/Ensenada</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1e35baa391c76bf929ace6c13d797be4</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>85c2046b5c1936ae291e0db100b30768</md5>
   </timezone>
   <timezone>
     <tzid>America/Fort_Wayne</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1c7b9385d4c028df6b64d83f485d3f89</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>89d10c6899856593be99c302ee8f8c8e</md5>
   </timezone>
   <timezone>
     <tzid>America/Fortaleza</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e872bf96bf17b47176a36feb448f5523</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5bb469255b1525188a5acd97d33871e8</md5>
   </timezone>
   <timezone>
     <tzid>America/Glace_Bay</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>89dcfb2c4d6e7e300ff2c09dc57b82ad</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>64d3feeac7d8b0ba46d6df7d7c1bf7c8</md5>
   </timezone>
   <timezone>
     <tzid>America/Godthab</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bdba8cbc6cbf7992fa986fbb015e5d41</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b164983aee94fca41a9c8cc6c84425ee</md5>
   </timezone>
   <timezone>
     <tzid>America/Goose_Bay</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0626638e85e62379f3898d3196c2b396</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1050a8cb28c250b1543277d77dbeafc8</md5>
   </timezone>
   <timezone>
     <tzid>America/Grand_Turk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3b8284f092daa70de261550da55536fd</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>794fd7b29a023a5722b25b99bbb6281d</md5>
   </timezone>
   <timezone>
     <tzid>America/Grenada</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>14dd2ca572daea2b10dc5043e08de847</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>32c4916ced899420efcc39a4ca47936e</md5>
   </timezone>
   <timezone>
     <tzid>America/Guadeloupe</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/St_Barthelemy</alias>
     <alias>America/Marigot</alias>
-    <md5>7a9859133c587de0a20af7d1140e60ca</md5>
+    <md5>4b93fee3397a9dfc3687da25df948494</md5>
   </timezone>
   <timezone>
     <tzid>America/Guatemala</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>cde93fef47ee68b6df6c659fa56104bc</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3f5dcae7aa6bebf3c51fad853b57f91e</md5>
   </timezone>
   <timezone>
     <tzid>America/Guayaquil</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>28f8c5ed72c5d4def311371370ad5ddf</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>21ed9dff66fd173039e03fb6552e4105</md5>
   </timezone>
   <timezone>
     <tzid>America/Guyana</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>757ce000cf306242a43353619f19b688</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e141f56ad733370ee92d340fa8189ea4</md5>
   </timezone>
   <timezone>
     <tzid>America/Halifax</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Canada/Atlantic</alias>
-    <md5>15b97bde388255fdf7c1ce9ae30aa023</md5>
+    <md5>084d4e929fc4b0bca4290c338843d8d5</md5>
   </timezone>
   <timezone>
     <tzid>America/Havana</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Cuba</alias>
-    <md5>02d557f40ae2c50d09063c2513200fcc</md5>
+    <md5>38fea04bb5c2f84db2687d7078eafab6</md5>
   </timezone>
   <timezone>
     <tzid>America/Hermosillo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>649e4044558ee398099fa718d26ba79e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>da0d9289c3121cbc23dfa27d98fa2ea7</md5>
   </timezone>
   <timezone>
     <tzid>America/Indiana/Indianapolis</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Fort_Wayne</alias>
     <alias>America/Indianapolis</alias>
     <alias>US/East-Indiana</alias>
-    <md5>90721c154cf9b86b3af093b170d9eb0b</md5>
+    <md5>d6c5e69d3f0f66644f5d6fc5bd20a2da</md5>
   </timezone>
   <timezone>
     <tzid>America/Indiana/Knox</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Knox_IN</alias>
     <alias>US/Indiana-Starke</alias>
-    <md5>6f06884417c25e90a20361a47c526952</md5>
+    <md5>183979417f44ff5a69caa4c4c88d90d1</md5>
   </timezone>
   <timezone>
     <tzid>America/Indiana/Marengo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>887d9ce76bc78593ed588e476222eacd</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>407883b0b98a68caf113155a1420605d</md5>
   </timezone>
   <timezone>
     <tzid>America/Indiana/Petersburg</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c758f4fc8e24b07099c563bdf56c2ed3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6042c395817954fdb836a84d3d8a3f46</md5>
   </timezone>
   <timezone>
     <tzid>America/Indiana/Tell_City</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0996af2b65e7418191e3fe7f697fdf6a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>150951054eb2517ca26d132979515d99</md5>
   </timezone>
   <timezone>
     <tzid>America/Indiana/Vevay</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8fbce0e2377e20762fcc5a0df2dfdc26</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>554d78ee1ff3b52724fece9849ede5f1</md5>
   </timezone>
   <timezone>
     <tzid>America/Indiana/Vincennes</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1c8c903c6ccd665a50d6aedc140b378f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c536774aa403629002b6c9fddd461b5f</md5>
   </timezone>
   <timezone>
     <tzid>America/Indiana/Winamac</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8c03a299852f6f5129fd8d615a09670f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7401e1b6e0f243c75cf7d50bcdda7214</md5>
   </timezone>
   <timezone>
     <tzid>America/Indianapolis</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3f868e4cdcdd6eb29c1bbf5d7798848c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6e96ffc0ee1b866a61e213a74d73b92b</md5>
   </timezone>
   <timezone>
     <tzid>America/Inuvik</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>68dc3551e5baf71a179d96169a5a36b2</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>75b287d7fa234e629fb3ebb871cfd623</md5>
   </timezone>
   <timezone>
     <tzid>America/Iqaluit</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b514429c80db9b068b65891548e83618</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>02462e190e1c5313cf58e71f524e6667</md5>
   </timezone>
   <timezone>
     <tzid>America/Jamaica</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Jamaica</alias>
-    <md5>08bef878a5cb3556220b971f3f62dfd6</md5>
+    <md5>d724fa4276cb5420ecc60d5371e4ceef</md5>
   </timezone>
   <timezone>
     <tzid>America/Jujuy</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0c4f2bc0ef8753e31ebd2d444e75b1dc</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9af342d45a2cf1ab125c5a59c40136b1</md5>
   </timezone>
   <timezone>
     <tzid>America/Juneau</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3b74fda207d428c0bc60fe2a2ca307e2</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>14a98f49f1689c554e9921b57775cae5</md5>
   </timezone>
   <timezone>
     <tzid>America/Kentucky/Louisville</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Louisville</alias>
-    <md5>49b2100010ffdf428d380cfe4c6fe86d</md5>
+    <md5>dc14d1f32704b2edd53a1d2b207eaa82</md5>
   </timezone>
   <timezone>
     <tzid>America/Kentucky/Monticello</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>db657abd841d3d8d4fd70444dcee94bc</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5a10d04a0ad2c8879e8757b16f86b9b8</md5>
   </timezone>
   <timezone>
     <tzid>America/Knox_IN</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>898c27f22999edcd197e925170662679</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f1c0a5a9b7ce9b86be0b906718ce8e21</md5>
   </timezone>
   <timezone>
+    <tzid>America/Kralendijk</tzid>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>45fb05b190eac8a15d76dac8a8d6d57b</md5>
+  </timezone>
+  <timezone>
     <tzid>America/La_Paz</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e9a262d2c2a19aeda5a4b3427da01e1b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>098e905a3dc2d7342fd4a966448557c8</md5>
   </timezone>
   <timezone>
     <tzid>America/Lima</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bb02df766781c421856375c9d96d0392</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>435eabd8a0a16343b7c9a038af520d54</md5>
   </timezone>
   <timezone>
     <tzid>America/Los_Angeles</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>US/Pacific</alias>
-    <md5>91fe68a09e03398fd9132b28cdaedd86</md5>
+    <md5>fca9e0d643cee547beae8212c0b53443</md5>
   </timezone>
   <timezone>
     <tzid>America/Louisville</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>089feb5f58851bbcd974c299acb019f1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8846f514b0e3642c753dd30b429108bb</md5>
   </timezone>
   <timezone>
+    <tzid>America/Lower_Princes</tzid>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>fb828ab9f7e8455946d67d4d3abb39b1</md5>
+  </timezone>
+  <timezone>
     <tzid>America/Maceio</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>985f8f6e98f067fea274850a6e20b223</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f1d1e125c6d67e76eefdd215a2ff0ed9</md5>
   </timezone>
   <timezone>
     <tzid>America/Managua</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d947cff195825a905305a7e0c47fea48</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a42c67a86908aa8c42268c15a6e3a135</md5>
   </timezone>
   <timezone>
     <tzid>America/Manaus</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Brazil/West</alias>
-    <md5>1098c0fa21edb2e460c9f4792758e4d5</md5>
+    <md5>bc91b57f3996921fe8756fabd0b1e1fb</md5>
   </timezone>
   <timezone>
     <tzid>America/Marigot</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f17d6c8f11c96d7972c20658e56b3124</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5112b932cc80557d4e01190ab86f19de</md5>
   </timezone>
   <timezone>
     <tzid>America/Martinique</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2784b7444b5d95dbf6fca33783f23323</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>decdff5a68dae812d0c1944c598fe9d2</md5>
   </timezone>
   <timezone>
     <tzid>America/Matamoros</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9c5f5da35d8b9fd8cd22cab8eade6a3d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>72a80a6d46bdc487762ce665168c03a5</md5>
   </timezone>
   <timezone>
     <tzid>America/Mazatlan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Mexico/BajaSur</alias>
-    <md5>2ffdda7f2d12e778feb1766fa62e1eab</md5>
+    <md5>24c68eb3d8327634c9f1b8dce3bed458</md5>
   </timezone>
   <timezone>
     <tzid>America/Mendoza</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d4987b2f5ceca90a08e292aebfe0522c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8a6109cd3324e91ad65078cda0501212</md5>
   </timezone>
   <timezone>
     <tzid>America/Menominee</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3b1b2d818ef32aa1394da914c50a7c46</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9fb30be5feca9f974d087acec9d6fc5c</md5>
   </timezone>
   <timezone>
     <tzid>America/Merida</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7b8842f7bf22ce867c85b8076f223ad0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a0fae46b60bdb1d763e4809d012f4b54</md5>
   </timezone>
   <timezone>
+    <tzid>America/Metlakatla</tzid>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>dea1e126a4dab896a439fa543b278275</md5>
+  </timezone>
+  <timezone>
     <tzid>America/Mexico_City</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Mexico/General</alias>
-    <md5>34d1e4a19267a3b927db2be82e02a617</md5>
+    <md5>2bf2d4a670f01d28901866cc57a13b62</md5>
   </timezone>
   <timezone>
     <tzid>America/Miquelon</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3b2377d0278a6f8e5069b4c36654ae78</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9544c4a062b62253abc28060069bf59f</md5>
   </timezone>
   <timezone>
     <tzid>America/Moncton</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>61428154465c9cbecb5d4759c00cbe26</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0c8a8d8bdcf8783f2df1fbbbe4d75179</md5>
   </timezone>
   <timezone>
     <tzid>America/Monterrey</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3a56a0088389aace524eae546b4430bf</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>972d0a68dc2762665d9dfec68101c625</md5>
   </timezone>
   <timezone>
     <tzid>America/Montevideo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2a700fb7942d5705552d0dd1c66fafa0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>36ddafeab5424d45c4ca20d9d0d7f389</md5>
   </timezone>
   <timezone>
     <tzid>America/Montreal</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4b9a778da2c46d3eafa43bb376e13205</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>24ab7668e9c7285ef01b635ee501cb64</md5>
   </timezone>
   <timezone>
     <tzid>America/Montserrat</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>66757f6278e87427751fde2a2758ff7b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1278c06be965a9444decd86efc81338d</md5>
   </timezone>
   <timezone>
     <tzid>America/Nassau</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>598abb2fc5b19d532497385a200fe488</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>870de727277299189392eb184e1a5454</md5>
   </timezone>
   <timezone>
     <tzid>America/New_York</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>US/Eastern</alias>
-    <md5>2d9bec32695c62ab323636894d74cb65</md5>
+    <md5>7f02ecc0b9c5f6a0145794886fb1e411</md5>
   </timezone>
   <timezone>
     <tzid>America/Nipigon</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>553f98de3ffc46b292eaaeb65f2ce9fe</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>87d538a5fc42bc0f12955ceb9ba171f2</md5>
   </timezone>
   <timezone>
     <tzid>America/Nome</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a9bd10af72c7a4462d468fd2c06a8ba4</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>630b48d08b9133057cf9cf1d6b581b80</md5>
   </timezone>
   <timezone>
     <tzid>America/Noronha</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Brazil/DeNoronha</alias>
-    <md5>e5a143e48abdb682af49e9b53663fead</md5>
+    <md5>1ecec7d8ed64a562f19dedd34ebfbf7c</md5>
   </timezone>
   <timezone>
     <tzid>America/North_Dakota/Beulah</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ef88313c87f08f7cd28a517d5086f079</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>060d3de8fadfd6b2b9c081bb4166c82e</md5>
   </timezone>
   <timezone>
     <tzid>America/North_Dakota/Center</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5488fb40869601823685bd12ca80c3c3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7b99f45af7eb194b07245620c5739cbf</md5>
   </timezone>
   <timezone>
     <tzid>America/North_Dakota/New_Salem</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3f021d6261af68e23d2d2d45e5d3e22f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e363646cd30c2bcb75475a99bb8bb234</md5>
   </timezone>
   <timezone>
     <tzid>America/Ojinaga</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b87762b86efda39216e28dac813f0fdb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>158306a6a0b7f33097c5a209e2d9a758</md5>
   </timezone>
   <timezone>
     <tzid>America/Panama</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d578cae741e9d61f0bfed9d5daf1782b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ac55fd15a3d0e6480308eaa395765d1c</md5>
   </timezone>
   <timezone>
     <tzid>America/Pangnirtung</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ebcb38b8258be794086d4386389a5d49</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>14dcab83cecd70e2134dbf58d7656106</md5>
   </timezone>
   <timezone>
     <tzid>America/Paramaribo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5368cf9fdcdb553c3afd78f0d6c44a73</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>13f0d12b0402897e7a68efe73e308bf5</md5>
   </timezone>
   <timezone>
     <tzid>America/Phoenix</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>US/Arizona</alias>
-    <md5>38acd916e1359510361235c9afcd5cb6</md5>
+    <md5>36f6704008b6a5150fe6b7895c131c91</md5>
   </timezone>
   <timezone>
     <tzid>America/Port-au-Prince</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c5742eee6723863cf24e543777042afb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b4c7c8890eb7d0f187a2c4cfaaec1c50</md5>
   </timezone>
   <timezone>
     <tzid>America/Port_of_Spain</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e67c574e550aff70b0ff733b26985d8e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e0bb07b4ce7859ca493cb6bba549e114</md5>
   </timezone>
   <timezone>
     <tzid>America/Porto_Acre</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1ca5f2c2cb5a40614d14a89697977dd6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ce88b8461b7217e1d9ec8f4dfac34670</md5>
   </timezone>
   <timezone>
     <tzid>America/Porto_Velho</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a9e2f24e9a40a68c9a3aae205bcacf9c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f78c4e4a4b7dd97d33578a92456aeeb3</md5>
   </timezone>
   <timezone>
     <tzid>America/Puerto_Rico</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>51eb32aa5363bc4fe6098f88b2de0d58</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e8b25a2b2302eefcf7bc63e89056c725</md5>
   </timezone>
   <timezone>
     <tzid>America/Rainy_River</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>89767f86a4c2c52ecab7b18876a34f9a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d394635ab6af436e6d8de1c71563d9d6</md5>
   </timezone>
   <timezone>
     <tzid>America/Rankin_Inlet</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9ad0d08947747170f209421ff4a65017</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a10b8199639bd62aff226b5c71b48b08</md5>
   </timezone>
   <timezone>
     <tzid>America/Recife</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9b037e7ad14c0f52786fb9eb3c4b8667</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>20321ae3fdff4f0bad72c3e4d1bfa83b</md5>
   </timezone>
   <timezone>
     <tzid>America/Regina</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Canada/Saskatchewan</alias>
     <alias>Canada/East-Saskatchewan</alias>
-    <md5>6fc39ad0bacee7a181f236b9217af82b</md5>
+    <md5>0ef05f6edd26a13b19cd25e86942d216</md5>
   </timezone>
   <timezone>
     <tzid>America/Resolute</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0b133fb621c14025c5e99b54dfd9ea9e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7cb27278d7d8bf430980b149d24385eb</md5>
   </timezone>
   <timezone>
     <tzid>America/Rio_Branco</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Porto_Acre</alias>
     <alias>Brazil/Acre</alias>
-    <md5>9e065ab026516d3a4312f1b729f1cc45</md5>
+    <md5>c41ff8b67906037ce014d42019e5831f</md5>
   </timezone>
   <timezone>
     <tzid>America/Rosario</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b45f45929dd036f7d3fa79f07186ea18</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4283b20ea1d5f58e092ac74d4f4c8f0e</md5>
   </timezone>
   <timezone>
     <tzid>America/Santa_Isabel</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f4297d1d4f79658b9a9147323e137581</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>258b10f97d147ad0fb9c3815fadf9b40</md5>
   </timezone>
   <timezone>
     <tzid>America/Santarem</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8a096b2ecc95b9bdfce361c4ca6cb857</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b8f9580b3198920b4d54331c37ea44ee</md5>
   </timezone>
   <timezone>
     <tzid>America/Santiago</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Chile/Continental</alias>
-    <md5>abb8104f47f738b9214dadf8d18e5682</md5>
+    <md5>88bd5131c72c87c3ce0bbca13134ca7a</md5>
   </timezone>
   <timezone>
     <tzid>America/Santo_Domingo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e7f512605821377cde466372565b9222</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>47d3a2d59a95167b7f8d37c447f41bf9</md5>
   </timezone>
   <timezone>
     <tzid>America/Sao_Paulo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Brazil/East</alias>
-    <md5>d92556c31e129514037b82e49a18116a</md5>
+    <md5>70b6c992341d503d191bca71461f1d0d</md5>
   </timezone>
   <timezone>
     <tzid>America/Scoresbysund</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d4905e6eb95a733d6eb902bec279e740</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b77ab8f21acbb83f3fe3ebb3fabac3d6</md5>
   </timezone>
   <timezone>
     <tzid>America/Shiprock</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8fa4d78e424556e881f1c3135e8fbdfa</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0d1376f4ddaf68b378adc96d68d4eadf</md5>
   </timezone>
   <timezone>
+    <tzid>America/Sitka</tzid>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3471ced20f493871b71306f4a67c3a03</md5>
+  </timezone>
+  <timezone>
     <tzid>America/St_Barthelemy</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>eeb885d2d5d89cf20d2fa62ee928d742</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0df0f96dd6aee2faae600ea4bda5792f</md5>
   </timezone>
   <timezone>
     <tzid>America/St_Johns</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Canada/Newfoundland</alias>
-    <md5>9367260975a764eebf334f99f3f6a409</md5>
+    <md5>3337a22eeaa3f1daf6d42619edb791f4</md5>
   </timezone>
   <timezone>
     <tzid>America/St_Kitts</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>226f9372a3ed5bd1fd306c1d1779c5a6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9b1065952186f4159a5aafe130eef8e2</md5>
   </timezone>
   <timezone>
     <tzid>America/St_Lucia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>828fd653e5f71f019c7280332d86789d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7cc48ba354a2f44b1a516c388ea6ac6f</md5>
   </timezone>
   <timezone>
     <tzid>America/St_Thomas</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Virgin</alias>
-    <md5>107adceeed7f4679fd06ff3b8ae629d4</md5>
+    <md5>f35dd65d25337d2b67195a4000765881</md5>
   </timezone>
   <timezone>
     <tzid>America/St_Vincent</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3f2c721f9c4d7b37bac3ebbcae88c508</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e34a65b69696732682902a6bba3abb29</md5>
   </timezone>
   <timezone>
     <tzid>America/Swift_Current</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2cf915990ddab08ad95a6bb836109da6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a5f66af8c5cb1a3fb195c31fcb260260</md5>
   </timezone>
   <timezone>
     <tzid>America/Tegucigalpa</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>482941e3834bcc0aa38d1c566bf4126c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4ccca027527894a72f9d33f2b7f26786</md5>
   </timezone>
   <timezone>
     <tzid>America/Thule</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a544d0ce7e95055a29ee35e2a018f2e9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8407b379865c544a03cc190bea8d4980</md5>
   </timezone>
   <timezone>
     <tzid>America/Thunder_Bay</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>550ec3e5697c597d40a3bb9865698109</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>aca23e8da3ddf706c59b20c669011a6c</md5>
   </timezone>
   <timezone>
     <tzid>America/Tijuana</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>America/Ensenada</alias>
     <alias>Mexico/BajaNorte</alias>
-    <md5>d573dcb4a5d5d91abadf7b0622c947a8</md5>
+    <md5>6e5df24afff030e0e4ee771e91e28713</md5>
   </timezone>
   <timezone>
     <tzid>America/Toronto</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Canada/Eastern</alias>
-    <md5>22e97d2cf539bcd4ddc864a38668ff79</md5>
+    <md5>2a791cddb7c810a1f81399e81c24da66</md5>
   </timezone>
   <timezone>
     <tzid>America/Tortola</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7d516b83878b788f5b6f533ed48cfb73</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>36252a7ac5c1544d56691117fe4bedf0</md5>
   </timezone>
   <timezone>
     <tzid>America/Vancouver</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Canada/Pacific</alias>
-    <md5>a109a219e552cedeb5aec84e59d9a908</md5>
+    <md5>6ab8c443c1bdb96a083bcd94511a43c3</md5>
   </timezone>
   <timezone>
     <tzid>America/Virgin</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>69618fb5ef9c96a9de1c94de85dbecfb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>302f38a85c5ed04952bed5372587578e</md5>
   </timezone>
   <timezone>
     <tzid>America/Whitehorse</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Canada/Yukon</alias>
-    <md5>87310162bf0bcce9488e2e76dbf504a3</md5>
+    <md5>871e90245f87d951850e9e410d321c74</md5>
   </timezone>
   <timezone>
     <tzid>America/Winnipeg</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Canada/Central</alias>
-    <md5>0bb842a956cfd302c849fac5783476a0</md5>
+    <md5>9bbd9d44ce618dbcdc2ab767fa583f69</md5>
   </timezone>
   <timezone>
     <tzid>America/Yakutat</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ad84735840866913c01a765b386c8cd4</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a7d1c7f8aaca68cf3b6a213635a74d79</md5>
   </timezone>
   <timezone>
     <tzid>America/Yellowknife</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>836a537bfff3769996a63183ff5ab000</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5d5d8c310682008f777445370de37560</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/Casey</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b7de8273028691980174dcf7ad5e3005</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c1060afadf7d755f5176e8a347d0159e</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/Davis</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>63ebdd9e12db8dc01d0000f8d1078b61</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ac9dcdbfd292ce6884147b0395f65756</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/DumontDUrville</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>be0807f6e8dc9dce3ad0995a4212d706</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e0a1cd5da53860548dd1151108e1263b</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/Macquarie</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>16ad04266385e18df3a99da9c068b08a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5af19eedce01fccb76e721f04e7d3316</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/Mawson</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f710ce03a9194b180e129b1ec3583d5d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>de4e5db2d2f670d035c4bde39f241e49</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/McMurdo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Antarctica/South_Pole</alias>
-    <md5>d45b23ee73e5eabd9d7fec0d92aa83b2</md5>
+    <md5>7866bc7215b5160ba92b9c0ff17f2567</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/Palmer</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ed72a95eeab146b34b41a69f7d0dcf78</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8d98c1c83d05f3a958b6b50d77f01535</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/Rothera</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>641756a5e90259dca12c5b709d96d9b8</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>21f021680f8dce01a060c23ecc4b7162</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/South_Pole</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5bdfa920c3f8154ad9820d6d1403f41f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ecbf324f6216e2aba53f2d333c26141e</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/Syowa</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bd9314be6dd35bec6543286a090b52db</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2cd5c9f2fab386295101115b3670a495</md5>
   </timezone>
   <timezone>
     <tzid>Antarctica/Vostok</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2ee2b3ce6051d0dd89ab165688af2d6c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>986ca28dcc682891b0833e0b1b2352d7</md5>
   </timezone>
   <timezone>
     <tzid>Arctic/Longyearbyen</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a784eb877319bb02fbdde034d1820f27</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>40145ed84de3f926275f1c2b5d68df7b</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Aden</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6b80c23b01e366ef42d4422263762794</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>72bdabb5ef3828bee344488b7111e306</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Almaty</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>14169b06da736d1b5aa3dfd6e92d9ea0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2d28e8027a12d6bb578500fba1212a3d</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Amman</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f218a425648f8b300ca4ac2722e2ba36</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4d42a3e2d81a5f0f423b96d12df0d53d</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Anadyr</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>913a8114b7a49535e2a735515b776317</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>06249b19fe482a0b2bed8bcc34c5f8b9</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Aqtau</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>015da5d2caf25879dfcd898d113aacdd</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>830f92a62980c57f76d40a685c528cb3</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Aqtobe</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>380097cb325d5e54e07d390839646814</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5599d3d3b9bcfe1f475e962ac7edb4d7</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Ashgabat</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Ashkhabad</alias>
-    <md5>0ba18870ac7b67df1611888f80cbc3aa</md5>
+    <md5>099834ad8db4f4eda369943fb64e8416</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Ashkhabad</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9651940409633c796b8ea1988bebb2bb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>bd392cf58dd95d8de8815f70053b41b7</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Baghdad</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>394c10742e185ebb8741083ae64dc587</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6b989fb5fc7f59e9b039e33d632361eb</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Bahrain</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4922f230b548503963a25da79bf50524</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>25a54a452113b53915112d5be0913e64</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Baku</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5ae16fd73000dfa945272d7038508136</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>89b1b87654cad2c27815ac8d7d5a82bb</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Bangkok</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5e97576c0b3331066fd06dc98bcdf51e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0ee6b61e4db09003f6f98d6d285a7f5d</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Beirut</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f9344d4f40b9ac3014d31432e25e8325</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ec07a7c21ed6e237900981ba9c627313</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Bishkek</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2d80252be1aea7d46826b8847e28a741</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7aedef57bdcef7c097d133beb66500cc</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Brunei</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>83eb034daccc4140b8fed0f91f4bc714</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>21ce0c633c3577552ef588e1312aba03</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Calcutta</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9084c38b0529749f095b21982af6bd07</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>43bbd7aad1dd165dc2343be99e5edffe</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Choibalsan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b5a33b682af25cb940f8d9985fb72135</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2b920f4fddfc354fe6facc5d17466d93</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Chongqing</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Chungking</alias>
-    <md5>2a2b85332b18ac228a79734f6a5c5bed</md5>
+    <md5>20f06242c241a8acff06126ebc9fa0b2</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Chungking</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1991f7c6c7b26b0c3ae7fc88501195c3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>91f7215bff1684393b0e26ee8a47fe19</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Colombo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>eeecebef588c1451c29501a1dc34fdc9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>db90d93971d1fcf94b3958ccab478003</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Dacca</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7bdc0d7bccaf44e5d6e87737be776b8d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d61213592cf3c9854562892a4116b041</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Damascus</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e893cd07eafa890a098ead4efb41f811</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>084ea233b8818a65efbe58cfc92a4a6b</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Dhaka</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Dacca</alias>
-    <md5>acaea67e7653bd9b07bfc3f280d41bd9</md5>
+    <md5>88035bd99ca7de5590cd00d7fdf3a8c4</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Dili</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4cf070386075a128e2ca1359bbebae2e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>51ad0f3231ff8a47222ed92137ea4dc3</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Dubai</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>75694e6dd67c50c95197a9929b8ae561</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e762e58c96d3726bbaf84bb914949d8e</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Dushanbe</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>dbfba9788e393138194469d081172ba6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c7b665d8c6693571d8f3da0da87dedf7</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Gaza</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c245ad4fce54247a654109d2aac96c47</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>94f0029ae23c4ae66c10c2c1936452bb</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Harbin</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>529321b154e4bed45ecd549dc363e05b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8d8c66b3749017ef82fbda759f135028</md5>
   </timezone>
   <timezone>
+    <tzid>Asia/Hebron</tzid>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0c9fc3e296dcb9e61c0e384fa8b8f259</md5>
+  </timezone>
+  <timezone>
     <tzid>Asia/Ho_Chi_Minh</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Saigon</alias>
-    <md5>97580c4eeb597ab8655d3e75262c3a0a</md5>
+    <md5>761dfd90a12d7edb0e38e68ab4ec13f0</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Hong_Kong</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Hongkong</alias>
-    <md5>368d1a2f6dff586bcb2d9250e22cca6a</md5>
+    <md5>1bf94fa0b1003914132d5958357fadb7</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Hovd</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>775f6ec6a92bb6e85dd02a70947133ec</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>08742642d2233876df61f686b391709a</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Irkutsk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7b9b16c323377b25580acbfde099ebbe</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>29acf8ac702a7d7841a3356c3962ff88</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Istanbul</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a8600aaef50f079c14e290c42969013b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ed7e5efff443788364a43ad36a9f6e46</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Jakarta</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8c185f964eb7ef23070614ffc4385d7c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>361f6e5683f19c99e1f024b3b80227be</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Jayapura</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9199923119ce086ce72c4536e15736c5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>292c823058149d8c8bee5398924bf64a</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Jerusalem</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Tel_Aviv</alias>
     <alias>Israel</alias>
-    <md5>facda736f3700f52f0669856d5c0bbdf</md5>
+    <md5>f1a8f9e6a80c9b8e29922e420bacbdfc</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Kabul</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>539d1033b88a3d04f0e1f23879b1fe3d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>aed7a26e32e4c36ee37c5c82d54a362d</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Kamchatka</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>041fd5edc6307323383b830c4b59df96</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3532d247ed7e9148fb500372f1ddff29</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Karachi</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>719fb183063f58bfb0dc31687676406e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a643fc5fed6a7cc9160a7d54da4c6e60</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Kashgar</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e339aaf1f2ceede2c3ca39dfe76ae7c0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>322ee93357cf482f7d3249a33e2be4b8</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Kathmandu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Katmandu</alias>
-    <md5>eaf245f9f94f408b4e10a68af275178e</md5>
+    <md5>2d26857827b178c66f3ad5e4ab7374e4</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Katmandu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>91b62fd029fbd792b4c5ee4536d7fafa</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>dfcdb151e17499a38c4fa456c6d603f6</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Kolkata</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Calcutta</alias>
-    <md5>444dccb232345981738808def1ebf508</md5>
+    <md5>262f867727cea4fb725260c76ac8af7c</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Krasnoyarsk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ba36e054c863b726fe849af2e1258fb8</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3e4dbf51d4e4d8988d4d52bc8e3932ed</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Kuala_Lumpur</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ede5f66d5a982e04605e7c86e0a803b6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>71f566a1ddf673e1705491dbdcb8d91f</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Kuching</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>326df0c3de6245a28005153c1bf23003</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1825fa4a570ecb00553b210978a4c96d</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Kuwait</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d0c4f475d2c7952a2f05410ec59af5c1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8488291a11082e8c8a6c6bb9015191b5</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Macao</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>777da83161869952b0c291f282d614ed</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9c403f19909de59800eed99888689e0c</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Macau</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Macao</alias>
-    <md5>70b015f9ab27ba97972c818b01a289d6</md5>
+    <md5>97b56bc1c103d2184a87a5f223430450</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Magadan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>28499637b8f50f9d2e4cdd2636a787ef</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>feb4df3f54948a62c9260a8ff0d8560c</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Makassar</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Ujung_Pandang</alias>
-    <md5>26b9060acaf481056fa44fdf8d92a734</md5>
+    <md5>efbc6213ee5099feeafaeacd6bbbb797</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Manila</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>53e964708083dd40aaf004f2dd290e6b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9d4ffa55833a81e021587ecbce498589</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Muscat</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f6cb2f96600471881b0619abe568d711</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a2477cb691fa92df2249e475582582dc</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Nicosia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Europe/Nicosia</alias>
-    <md5>66839c9b2439f4b2e8322a5609c4ce89</md5>
+    <md5>89053abb8deb454081add25351a7f9b6</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Novokuznetsk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ac59178fd52dd4d92f1cd81027e1b43a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b88718e35ff62bcb169bf2ad91d2b37a</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Novosibirsk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>758d2569721bc7fe8fceb254631a6d06</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b8e017738a63324214d6586cbf078d62</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Omsk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>cc1956e671ea66262db3528b381bd0eb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b3b7662bc01e6871876853ce6e765105</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Oral</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>828d4ff0ba41b8cd736b2a180d05afdb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>71aef65267ff2e5d89656cad08dd9c32</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Phnom_Penh</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9e211b43ac0bd1ba9be5a172af0b0d1e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>81f9a62270d9ecf41a1df84fee76b26f</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Pontianak</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>81f6f3d1de5bed831a9c18a7ebb2d2ff</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5558eaba9bfdf39ef008593707cadcda</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Pyongyang</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d5d783f5ce5c76c3f7eedc83b5f51afb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b6861280b8dc28affa6aeca079c88a8e</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Qatar</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>041820546d49daa7d188d4f461a7612f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1f5766aa379a0983e2a7febc0a89037c</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Qyzylorda</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7017be9df67c7789cfcbf970540ce965</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8a6a15afce4cf1d585c91eb4a5b6ad08</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Rangoon</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>27e308a3ef5f4bca4406297ffe3046ca</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c438262da15f7ea331c7f17f3cd9741b</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Riyadh</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3b35f2dc4b38354d324aa7da7af40392</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6d11d7edcfa78b32acf9a17169ce728c</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Saigon</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c0476c0c86db56b0dc85e4df385e6046</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1909d3c03fdba843ae7de0d1da66d9f9</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Sakhalin</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4b6ba872cde485f81c797e5ce2dac90a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b53ad0ddb957456a2074f2778268f0d2</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Samarkand</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1d30a9f2b6a5f165d1f7dfeed4c6cc31</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4c5fbc2617e145b85bfc2260591d4daa</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Seoul</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>ROK</alias>
-    <md5>4605e756d086fd9b0f95ba6bdbcbae90</md5>
+    <md5>ddab80bd6902fd85f4a75a99fe066c50</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Shanghai</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>PRC</alias>
-    <md5>c7985096e8a727a4ab3b79ac7a828040</md5>
+    <md5>e862e9eff8846445c99bde5abba2569f</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Singapore</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Singapore</alias>
-    <md5>3f7332e42f78ac89d9c1a28b8622f106</md5>
+    <md5>f2f8be51082b2ede9114b3c78a24c608</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Taipei</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>ROC</alias>
-    <md5>9d392a8ef42db0bbf519dafef412bcc6</md5>
+    <md5>392c0daab0b369c725eaef960e59cb77</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Tashkent</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0fb54d04b852464dc5761ea8c446b8ff</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ed56064ae96e061f96e38e1414ff1e40</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Tbilisi</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>26f7f38c4a2b671824e97f2f778c544f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a473849976251aac174309b4c54cc7b8</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Tehran</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Iran</alias>
-    <md5>50f2759139ffa076f5dd89762aa82805</md5>
+    <md5>7cc49f33778450e85624f0f9489bb42e</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Tel_Aviv</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>19f82c10e5fd8e13e0e9051fdfc3e183</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8bed5e3cbfdc3d315de1b40d91e6981a</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Thimbu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ffd6af2808fd9504cb7f08c24a0db9c1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>895c0dfb8ff2432fb13ac753396068c8</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Thimphu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Thimbu</alias>
-    <md5>ce16342503096656df6094233c121ccc</md5>
+    <md5>3b523bb3f75bd0323a6336bb2fd3a51d</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Tokyo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Japan</alias>
-    <md5>22ec39f98d3d8fc2ee920a90b4a06ec2</md5>
+    <md5>596917b840456dcac60971ed275e06f9</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Ujung_Pandang</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>784b80ca0113aab679b200e44fe70b84</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d05b22df61dea5d57753440e8b5ef386</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Ulaanbaatar</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Asia/Ulan_Bator</alias>
-    <md5>a45a3e93d090e56ea43c73ed6d285acc</md5>
+    <md5>5aadca75f29da32a0ff78e3775363d06</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Ulan_Bator</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d1fdbf7f908c69c5b3df79715ab6f5ec</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c6c0c26aa2bdc2936972a34fc086149b</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Urumqi</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f87206b1c9198689ce720df233bb7036</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>bc247e6fadd19729ce941a5c4e52d163</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Vientiane</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>22fbabecf32f048104ded204479aec86</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c54d00005929463b7c5ba889c5ae9b1b</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Vladivostok</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>29bfdba180c86001360f6031b89cebfb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2f8cf1b4ef5274cf8e117d0a8a591c44</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Yakutsk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d8b81a9798f0299c7255452c03d5975a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c8446d91924f4f5f899e821604f6e2dd</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Yekaterinburg</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0536395d4b8f29cf17db7d61277ee7a3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ceb73b7be048c14a0ee0ecc9a91d3652</md5>
   </timezone>
   <timezone>
     <tzid>Asia/Yerevan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4ee91fa55df5ae4b4ef127d839f1b3fe</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>be8ad304fccc142e66de98c75e33a5ab</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Azores</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2a7fa08397e5a253d6dbba46a75ce948</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>791fd8faf7c5e495ca3f1f5f6569730a</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Bermuda</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>52eac82e4b5e6a497458af0364ea859b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c89a0fd896e18b423abfc88e3832112b</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Canary</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3b0db623a5448caf0a942768773940ec</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9146a32bcc02553fcb1f9ec281da9779</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Cape_Verde</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1d4c63a7ed97112e4425c00c12b1d8a3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>486c6cca3174d50e3d3454c5f1f73480</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Faeroe</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a769309c5ba22877acd1ba4224b1fe78</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b494bcd3f53a9d8163d314897336c5f2</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Faroe</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Atlantic/Faeroe</alias>
-    <md5>76ce21b7fb95da27b51dcc03c746791f</md5>
+    <md5>0b8454be6b72d3aa43e58a0f70ed9b81</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Jan_Mayen</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bbc1a692c33a89efb127f06e1020dc21</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>fd246a3cc9a7e70abaab4c3ef57f79f3</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Madeira</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>93b67a3a4740e9617b9cca79812cb91b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a3bba0ab3f973d6a4e60478c934b7e09</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Reykjavik</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Iceland</alias>
-    <md5>64b4a295229ba36c828762d5e0e75532</md5>
+    <md5>992200e91e57b5dc3b4c1387c8b97466</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/South_Georgia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d4709c22407d9e9025a510d9ca252640</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a39b381162f4cca3a0423cc71824c55f</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/St_Helena</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e81bce49d94a6d9c69e96392bd05222a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0166dbc020d487b7bb903f17769b3720</md5>
   </timezone>
   <timezone>
     <tzid>Atlantic/Stanley</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>23c31bfc7aea9467056b4ea937305573</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0617de8449f0b759c7d09cefc1dddd16</md5>
   </timezone>
   <timezone>
     <tzid>Australia/ACT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>db066c2df2f404d656f75e51767b8e40</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9c9e45a080f6c7f427aec34e11291278</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Adelaide</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Australia/South</alias>
-    <md5>f57af299a6520fec76ec1f1d068455f4</md5>
+    <md5>ca7281d2d6822a955147c350b7b1cb71</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Brisbane</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Australia/Queensland</alias>
-    <md5>20ca89ab215143e09b6ad5f65fa68d5f</md5>
+    <md5>a35c97646a88eec10ad3a6e6b567e508</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Broken_Hill</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Australia/Yancowinna</alias>
-    <md5>cff07762dda8c8347a593edc248bb469</md5>
+    <md5>0f8e51628d17d8f91b3971d3a809a3bf</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Canberra</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>99778b87101117e2dced4ebcff7b5dd3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2505a7cf51647c591b3919e64a7c9c6b</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Currie</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e2411588e21765b8df6af886f5632833</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>42409348c1d54c59f3181351025814d4</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Darwin</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Australia/North</alias>
-    <md5>c89f5110c34efe3560346e7a62c57d59</md5>
+    <md5>73bbf21cb68354d5fab3393f9e0cc467</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Eucla</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b43e564dc008242e1d906ef6e97163f9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1b3c9e044ce22312c26bb983c59bb736</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Hobart</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Australia/Tasmania</alias>
-    <md5>1b0c6adc67fec258c788b649921e8fb7</md5>
+    <md5>3f93782299131bc5e257f74b156c7bff</md5>
   </timezone>
   <timezone>
     <tzid>Australia/LHI</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>71a13c2df13822df8a78a18e1149b86b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6b36a74e6c684ccbce21b77e4d4091f5</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Lindeman</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>50a95c7265324d3d7370b88d68c3d7a9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1e8f20bbf164fcd3cc7b73f9f75719ff</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Lord_Howe</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Australia/LHI</alias>
-    <md5>fae96929a55eaf8ce70b77f2ac6805d2</md5>
+    <md5>daf0954473ef7d097f05ec2eb76f3351</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Melbourne</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Australia/Victoria</alias>
-    <md5>7a19941128d1288302e5cb9c7c5fa219</md5>
+    <md5>037416e5be342cd637de9d2e3ed77463</md5>
   </timezone>
   <timezone>
     <tzid>Australia/NSW</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b7bc7491fdd7fab117c37b2d29c8d852</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>21e3bc63a47ad045e53077f1d438f93d</md5>
   </timezone>
   <timezone>
     <tzid>Australia/North</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2c73d84d10141e282a4f9557a9346b9f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>721e27da253b8e74cb741374b9b0369d</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Perth</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Australia/West</alias>
-    <md5>f8bc3c2a4f45fa8bf56f17d84b405a9c</md5>
+    <md5>a9da90a8b6373ae57da42a972cfa5e67</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Queensland</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>71aac1a36656fdff0bf8e431d2795a6c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e01eda0a4b9dc7109c6c6f6a58c2be9f</md5>
   </timezone>
   <timezone>
     <tzid>Australia/South</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b5d9388a610d79ea43763f46397e2a77</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a06d5be7aef4ebe989cb2935a6e72474</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Sydney</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <alias>Australia/Canberra</alias>
     <alias>Australia/ACT</alias>
     <alias>Australia/NSW</alias>
-    <alias>Australia/Canberra</alias>
-    <md5>f0afeb2de78c01d9b9cee8399cdb58cc</md5>
+    <md5>bcdd3fd1c6c326bdef770905bedab9d1</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Tasmania</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>cf82f5362ae99083bdedeffe58901d4d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6e5ed2a391ecf3e73f6a681c54f6a812</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Victoria</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6292197647dca58c18fa597701226cb0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c377fc0182ffacac506bc15b2a3a85ac</md5>
   </timezone>
   <timezone>
     <tzid>Australia/West</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bd5a8bf4399ba7b5f8b22b57af822a43</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0bd8e32dd1533af639e9a0de85a95f87</md5>
   </timezone>
   <timezone>
     <tzid>Australia/Yancowinna</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f87ac1003867f02010bb8bf0cc58fcc1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>da6459a041f1b5580ffb691930c7c6ce</md5>
   </timezone>
   <timezone>
     <tzid>Brazil/Acre</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2d42afecfe9b9569eba8a2fc453b96aa</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b034140cdfc442b0f989f6a6dd6ec620</md5>
   </timezone>
   <timezone>
     <tzid>Brazil/DeNoronha</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4d854d29975bff69f6c462db85701bf2</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>076a9732c2a10e6f4f83e815315c8b8e</md5>
   </timezone>
   <timezone>
     <tzid>Brazil/East</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>43bdb6e7291587256aa4d3a635e2071a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ee00e2715bd490456eb11be0f7354ad6</md5>
   </timezone>
   <timezone>
     <tzid>Brazil/West</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b72b36b3d708816e735ea600683fedf0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0418c9a738a469a96ff39a2a1bd4dd72</md5>
   </timezone>
   <timezone>
     <tzid>CET</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c96065172df48923dfda9a0d441f8d41</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>38e699fdd6cc85fe609f4cec162faf67</md5>
   </timezone>
   <timezone>
     <tzid>CST6CDT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b8caeb201f96ca8956c964f4d355e86d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2ac180eb45fdda3460f26cee12a017e9</md5>
   </timezone>
   <timezone>
     <tzid>Canada/Atlantic</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>670187f29c0dab1f2a533d46c7db6220</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>cca2a3b24abaf7b369d38c4ba0e5e964</md5>
   </timezone>
   <timezone>
     <tzid>Canada/Central</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d5374b13077ef7d816a8f42f84567416</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>759abb1125e957fa0172761810e152ec</md5>
   </timezone>
   <timezone>
     <tzid>Canada/East-Saskatchewan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ef29666d71da2726525fb5e7c4628675</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5e73df69273394d0417d0586f5c31fe7</md5>
   </timezone>
   <timezone>
     <tzid>Canada/Eastern</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a03b6a887ccf2779dcb99f14256edb8e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>44075f2012d734ef8770ed4549bc56f3</md5>
   </timezone>
   <timezone>
     <tzid>Canada/Mountain</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>022ddebe4c52e691a26a082d93714a2a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2582c4ad9b1e3dd66a269e725ea19e19</md5>
   </timezone>
   <timezone>
     <tzid>Canada/Newfoundland</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>805a030b9a8113fd92ab3674f378cb41</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1c3ab8a47cd50747678fe05c41abda49</md5>
   </timezone>
   <timezone>
     <tzid>Canada/Pacific</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0b2620879c72adb20ee147064fc9af31</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d38b48abfb92ce98b5177fc31c6c430b</md5>
   </timezone>
   <timezone>
     <tzid>Canada/Saskatchewan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>18a2594bcc9609c49872a158b6d309d0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>80e2456cc6032219f674def5bd23c35d</md5>
   </timezone>
   <timezone>
     <tzid>Canada/Yukon</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>680327261b3fc3494152d2f290ea102a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ee6648283e8bedb3fdb8c57b9f434a26</md5>
   </timezone>
   <timezone>
     <tzid>Chile/Continental</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>680bf0697fc77a3dd8922420abb1f306</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>033739e6415501a8cf6efb309ffb25ba</md5>
   </timezone>
   <timezone>
     <tzid>Chile/EasterIsland</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ed84071967448af72fea11ea8c2ff531</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>99c0caf1092c3c9ca614ceebe0421967</md5>
   </timezone>
   <timezone>
     <tzid>Cuba</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c98d755cfe335f1901ebdbe25224d8cc</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>94c9e7655a3ce235e58471df582f8115</md5>
   </timezone>
   <timezone>
     <tzid>EET</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c7d529b441f0a786c4f01424c42547b5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4313a5a54018d63bbe5556966813bd9e</md5>
   </timezone>
   <timezone>
     <tzid>EST</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5ecfc6b93f491d7b3795ea398c319493</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1f7a798a672bb625ef9a9dc38865ad26</md5>
   </timezone>
   <timezone>
     <tzid>EST5EDT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d65f1fc659b6bfa7bda141b578f31378</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a9e719d7f0be1abb2846120179599a2c</md5>
   </timezone>
   <timezone>
     <tzid>Egypt</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>59587cdfeecb9698857ec613108fa34a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3ce395ffeaef379ab31b9674a99e7f5c</md5>
   </timezone>
   <timezone>
     <tzid>Eire</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5413caa2a5719c9126a08dc445db0718</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f8c85e542a416cd7fd792f21241475bb</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Etc/GMT+0</alias>
     <alias>Etc/Greenwich</alias>
     <alias>Etc/GMT0</alias>
@@ -1952,1026 +1984,1026 @@
     <alias>GMT</alias>
     <alias>Etc/GMT-0</alias>
     <alias>GMT-0</alias>
-    <md5>24a9dcffbb77262f96d66c173f05315f</md5>
+    <md5>ab58ab7e40554f9e1532b5c91c4a2290</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+0</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8267ba3c62bfe5326b43d13f0ab972ad</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>31ae129ddb11ee36d193f9a3ed6fbbf5</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+1</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e033ac67903ae6e007aef4de9a2cff21</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ad1164edd3afc437582b0c21ddb606d8</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+10</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>eb3cd710e7dceae90ef72fae5e7fc573</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e7cf511156c742301ae9bbe08e28f0f1</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+11</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3da83b8fd36b99f1e14d5be1b35dd7b4</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e9f05290e38fd9ed728763e4b9e5439d</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+12</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0fe6a06c5b907e281201838cad33dba5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>aba6f221c1ac0cb8d72aea5956a7ef5d</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+2</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>db3f55cb06eb3d7b60a6974b42f0dc60</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a9135520a98c2e3d61629c16e58e6017</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+3</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>177e90679792ce0a9e2f5417baa1f3e4</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d7fde3e7da31297ae97b445d1ef7e988</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+4</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>28f404574e68f6d8f84eaa3a0a63a469</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>407acba91437208e0c78f7b42f403227</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+5</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>92ff5fa1f10039769a498dc6c0ae1ced</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4b48f011dc987087dcb8d4346a567888</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+6</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ebd993f92514cf7ff0b99b448b8b8846</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d396d35ab185928620e0e4bbfda60f0c</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+7</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>db078e01eb87f0d635f4a797def5cbd0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e4d4cfbf1cd6026b8955c0314e2816ec</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+8</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>365cce7e2d2806ef0d7c5b058e35c219</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>59d50ed00acda4bb3d5fc6bc572f0ab2</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT+9</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f5542c5230d30c619033b74c27cc901f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4362eb31ba80786261b4edf00f962ecf</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-0</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7f24bca21b2e01edfa7ff176d66e1740</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>744c1800ff66f96718354844f1e7f822</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-1</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4d71df3025dce932498fcf34b82365e9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>24af656c7462bda0079f141819b3f2e4</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-10</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d43a63c01b501ada0b8587ab9b68508a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3015128d09b28b9b61af7b2d2f079387</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-11</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5790bda8dcc20f060308d9996d48aac2</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d05697c24a8f26f513b0aa47d0e2647f</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-12</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f3dbbb903b3edc3797f98b7156148ac7</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>24e457e75e5a2ca8b4d5699a3b16a0c1</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-13</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c4a1754b45e30b4ad0841189a5ad47be</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>34225980f61b23b0550e21d2b4d60eef</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-14</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ea5d1e3b84a2b416019d1b4561c0f8fc</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>46389ea78726bbb63bbb8095da03d086</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-2</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>08f530f55a73e55403029dc0920e3f3b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>af46d7d274fc8c305026a00e1255f3b4</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-3</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e04228519eb5ee052efcb550ab794e5d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e38758c514f3283fad317074adc8b4a9</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-4</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>94efac1123c46b50ac559454d8e4b9f1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d611bddf444a4e898c1bcfc0321f9b20</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-5</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2561b58917cceb29226258f5ab17656a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>30b26f9ae0dc2fb80dc6906d80b3a369</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-6</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f1e61aacfe9b7ac9e988c639848f775f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>78bb41c2b0709dbe08ad4e6cebae4cb1</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-7</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d2782bd83e7b07c706960aac63a7dc83</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1e039799bd225c5baf1d7d615bb87ebe</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-8</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d417f51f4a45c0407e1f73113d854a3b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9369469235996de1914e60d39bec2c2b</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT-9</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>aa44bd3b5cc062288f393ea8e9a61f98</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5c38c2f0daf2e5c09d98e4dd24c6efc4</md5>
   </timezone>
   <timezone>
     <tzid>Etc/GMT0</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e7c20064a273c4d3b99983da17b880ca</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>220f0fe2271e1e10abd5f1e96091badf</md5>
   </timezone>
   <timezone>
     <tzid>Etc/Greenwich</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>494fe0852a5b8ab69539c88cd32ac001</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c19e43fa0d921314045d341929b2b6a6</md5>
   </timezone>
   <timezone>
     <tzid>Etc/UCT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>UCT</alias>
-    <md5>dbebdb901d3ca63b44fae8ea59c58de0</md5>
+    <md5>9d822cf62e78f59186f283100747776b</md5>
   </timezone>
   <timezone>
     <tzid>Etc/UTC</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Etc/Universal</alias>
     <alias>Universal</alias>
     <alias>Etc/Zulu</alias>
     <alias>UTC</alias>
     <alias>Zulu</alias>
-    <md5>647f260e8bdf958f5889d1dd2a4ba248</md5>
+    <md5>d50331d2de5a7bf1f6e364e0381f366a</md5>
   </timezone>
   <timezone>
     <tzid>Etc/Universal</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1d5131e1b6976ee063e21bfd88173f25</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9ecca0082312e52e65024a0e1358719c</md5>
   </timezone>
   <timezone>
     <tzid>Etc/Zulu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>445e8cefe9b4f22f952505fbc56e7a75</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>760f08d7ada624fe6b4a09fc8536daa6</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Amsterdam</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6a8841f753a5e5ff3f3183baa1b80387</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c9008d7c6b2ea2302724da69ef061594</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Andorra</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>401c2f9a1b8d9becadf9811d3e47ce61</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3b455db928554d5877c1ee399a8f3fa5</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Athens</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>57fcad5e5797427b4321d47353b776a1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a6b491efd7b9264946b09a6d1f348ab6</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Belfast</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8915fc1f64309699bdb635ffe17d6b34</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>39a805411344938e8e8655bfa3c37565</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Belgrade</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Europe/Podgorica</alias>
     <alias>Europe/Sarajevo</alias>
     <alias>Europe/Skopje</alias>
     <alias>Europe/Ljubljana</alias>
     <alias>Europe/Zagreb</alias>
-    <md5>f35688a3e389163467e9f191c0fa97e5</md5>
+    <md5>01899f70edc28e85861ae9634c8d4818</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Berlin</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>87587b2ec8a203f2e6646e36a3f4867b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7eff1fef65c43f08d542edcfa1d67180</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Bratislava</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1c059970c03f59d05085e1a7b7e4f1a9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4c177543b6efc02239561bbcd97738b1</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Brussels</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>729d9c8a130038acc430bedf91fd247f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>992c1070f650acab5ee1f6fc3fcdbae6</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Bucharest</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1c985250aa1b8313c219936af02c2852</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>06f5949f16196a72a928d48015af4da9</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Budapest</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d2c154bfb7b7e0d2310681a12efeca3e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5d9410ec171c22f3cb6af853666832b8</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Chisinau</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Europe/Tiraspol</alias>
-    <md5>605c553e75fc606cce53516b6b8d7528</md5>
+    <md5>cb3ac02f4459388440bd3dcadcebc8c6</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Copenhagen</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0cdebfda1b1c2e9c76023140a7e27f81</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2623d7ea241c980ff79009dc9811425d</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Dublin</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Eire</alias>
-    <md5>84d40b0758b82158b2f95f9069d2d34e</md5>
+    <md5>e1a3557f809de4528198a637f8aab203</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Gibraltar</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>98b2c65efc5ea6f9c75621a0aa251d46</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c6ee0d863222572b689a5cd5c4309449</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Guernsey</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>328904ecf06664daae7be948338fd864</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>cc746c3c4eb498e3dd0272b7e6d90f53</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Helsinki</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Europe/Mariehamn</alias>
-    <md5>30f6c8d68f93d4303f901e315339dfbf</md5>
+    <md5>dd283cbfe6254558e2bb8ea6d02d29de</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Isle_of_Man</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1e1909739a043b39cbcf127c63902e7d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a9d43de9437d94f2a986a3d980908996</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Istanbul</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Turkey</alias>
     <alias>Asia/Istanbul</alias>
-    <md5>c4e556c58c092a82e739ef031c5cafc3</md5>
+    <md5>04abd7350e974dc2a3c18d0ec3165bee</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Jersey</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1aea27a8b7f62f695a7442edd792e303</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0d7a5c63ac8e17078ea4d572b0271b0c</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Kaliningrad</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a6da2d2a77bb83dfe0ef56025ba5f210</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4c60c5a58f54e04b1e78ca79090900b5</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Kiev</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>fc20427bf432f3f7f8258ac5e4395e8c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>37f1114be2ca8c943d1f7a4530ffa7ff</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Lisbon</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Portugal</alias>
-    <md5>4ade386f9efa48dfe4d2e800057f1768</md5>
+    <md5>f0c81cd5f6992f5d1e1530ac57a08861</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Ljubljana</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2e487b3ab93245ab43b421fead5a3553</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f19fdf5faedc9ff69ac5c212f3da1b44</md5>
   </timezone>
   <timezone>
     <tzid>Europe/London</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Europe/Guernsey</alias>
     <alias>GB</alias>
     <alias>Europe/Jersey</alias>
     <alias>Europe/Isle_of_Man</alias>
     <alias>GB-Eire</alias>
     <alias>Europe/Belfast</alias>
-    <md5>58f67f2f002b163e076430e45c36abc1</md5>
+    <md5>d9c25d5b2eb02260bc94730e235938b9</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Luxembourg</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>71663add4e36bc621fb4f35a97263f08</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7abe6541def13604c311c9b7392557a6</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Madrid</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8f3709ac1d2373792ce5012af6352ab2</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>829616d918093c1dea4bfb9fbc2fce3d</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Malta</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>74e10dddff64fce62ec2da4235e67402</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e6e445c7126dec6762ea09ca841cf1f2</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Mariehamn</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f0e960187ee2ac713245c5581a2885e3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>66beba42e7efc813938aaf2c8e9d5342</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Minsk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2387b7d888b8ae24802f0dbed79c6453</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a7692716e353f8b168b7dc238deb8fc9</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Monaco</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>21c576af4b5b8b010dac151b4adc987a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>bcae1d6ca668c9272a4c665abb59d0f1</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Moscow</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>W-SU</alias>
-    <md5>26fe3e7feaa8637be6a3997385f31221</md5>
+    <md5>163c9f35321ad3b6d79c5e13d3de4a66</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Nicosia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ff83e9e0072ae9fb9cefbc63f0e694c8</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c7d45824ebedc5f1501013ff28549574</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Oslo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Arctic/Longyearbyen</alias>
     <alias>Atlantic/Jan_Mayen</alias>
-    <md5>336dc94f1f3226ab1ec106790f06bab8</md5>
+    <md5>dc0867bc64f0b19c7f7cad019d713ae1</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Paris</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6eb808f296dfc5a7015f57602e02983d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9b680a4ecc341188ff6443d32341388b</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Podgorica</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3c13722b53d2b2092c45e17e63ac4142</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>189746d0f121fd91c331af15e338bf21</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Prague</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Europe/Bratislava</alias>
-    <md5>6cc2b1728d7e41c4d3605de294dc7b26</md5>
+    <md5>66c9d95e26a9cae9210793f2f321eaac</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Riga</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>184739fe132abae94c28b1f8cf34d7fa</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c681c3dc7a02d76ca5504e9c98f8eeb5</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Rome</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Europe/San_Marino</alias>
     <alias>Europe/Vatican</alias>
-    <md5>fde39f923a7adc43058de5b1d85aa81a</md5>
+    <md5>6045fad13fa140ad98a6e6a1994ef18e</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Samara</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d822617a64ba10802f8b3a673efb82d3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9c1b93f97de31a294309b3bc69003bf6</md5>
   </timezone>
   <timezone>
     <tzid>Europe/San_Marino</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>07053032ce760b8a06c756695f598598</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>73432e03baedf81e25473f83b35f772d</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Sarajevo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d05aea27301b5f26c54ec097d3e186f6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1fadc0b163b84df6069d6234e4e1c9f9</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Simferopol</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>11811a2e4e92ebf8fdd2b7eb1c08b3b3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5fe75859a24528324fafe56d6a576ac6</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Skopje</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9dd7e535562f7915898e965ade8fc1c0</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>169bf6247dfd235d384a2d60c6ab6ed5</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Sofia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>31af5d53eae9e7a4a19a89b08fd0afa8</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>fffde28610fca378b8a81afbf91aeedc</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Stockholm</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>869ae8dce97ddec76423a3a91c0316c4</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>30ce2f07809346abb90dfca1627ef79d</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Tallinn</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8f63dbfb2fa4e066896a30cc14dd730a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>24889827a14902c6f2791849c9c3c6e0</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Tirane</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>14087b815ef08b31491a53f2eb9947f5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>477f6423bb055be4bd0d08e6b9275057</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Tiraspol</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>9670d258f90059332afef75251a1faf9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2e2bb67b97eab1d8184bd249663219c4</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Uzhgorod</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3e6eeeb7888155257d639c526cbdcaeb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d92867599074cb7acc31b58e91f2aae2</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Vaduz</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>955a91de9941da5cb21c3582870f4588</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a8a4e48e0a06cd9b54304b82614447c1</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Vatican</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>72600aff75a9d3183bcf2ad976ee7556</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>02695f2268c1364e5bc032c460c28e2c</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Vienna</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3285d0e0be4c62b1dc1601a3be468926</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>de7310f3598fd5d0226590b6b775e70d</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Vilnius</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1cd371865c3988c4bea034de76d4ec9a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a79f6b31b1c5d6357a360793e5e720f8</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Volgograd</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ced875b92a331bd159de9c66bc58ab3d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ff054663b12ac0c37e90adf89a5c1f6b</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Warsaw</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Poland</alias>
-    <md5>cb0a91ba298572bf2e0eff7f104d9b90</md5>
+    <md5>9011dff96ae67331fefb285befee32c7</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Zagreb</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7218b5bc34a3a0c9653a136377de18d1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>28a36cb8a47ac95405a47d249387cb79</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Zaporozhye</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>86bb9c3ce1578fafee3f59b44345a5e9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>493d948c98cb82cbbb0a11480a9d9944</md5>
   </timezone>
   <timezone>
     <tzid>Europe/Zurich</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>feea02ba1f781d2de1a4e4fe05f45813</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>189add82d7c3280b544ca70f5696e68c</md5>
   </timezone>
   <timezone>
     <tzid>GB</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3fcbdd522c06e287b61133fef1234038</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>cf499d3386c1547d82ada718d426302a</md5>
   </timezone>
   <timezone>
     <tzid>GB-Eire</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6af799cf04d1377b9f5942313a07fe17</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>96eedeecef8152ed33eef35c5f80ddea</md5>
   </timezone>
   <timezone>
     <tzid>GMT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6ba85e7d1059adba124a6acabb6ad41f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7e1ee359c14980b307a35b4ea42e2ddf</md5>
   </timezone>
   <timezone>
     <tzid>GMT+0</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5c4dca67fa25eaf88c22c4f8bed6ea17</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ce675f57f78b3a1e213c8ad399205020</md5>
   </timezone>
   <timezone>
     <tzid>GMT-0</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>02ebda7049fb71d3243be70ad947b850</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>bab3cfab355f4a23a6101500cc0ad9e0</md5>
   </timezone>
   <timezone>
     <tzid>GMT0</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>48bce60e4b08807a1d108d2bd9dac404</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b02b3430b23d30714a470ed456a9f19a</md5>
   </timezone>
   <timezone>
     <tzid>Greenwich</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ccc18b6668d177d18eb0e13bfbae7e75</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>47885ad66487af94b749e903f8fcc942</md5>
   </timezone>
   <timezone>
     <tzid>HST</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bb10ead18ee3b6b071e8e64437546a28</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>406972d8f460561b5ed0cc9635075cec</md5>
   </timezone>
   <timezone>
     <tzid>Hongkong</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8e2ac8066c8dbe5d81fb9edcc44f22d2</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f1eb6afd387c6c934bc1ab7463a7e41e</md5>
   </timezone>
   <timezone>
     <tzid>Iceland</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1bc6207ff16853f23e2237e33d3867c6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1f3e3f1d74ac62c6309335ba7def679e</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Antananarivo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>98591ed19e14d2a861ee484fb7bc62e3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>54b8cf688972faef6254eda042d0b759</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Chagos</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3d065171da207e8bd3d4c7bcee1ad968</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>567365fd5ab73a691202c4c0f1a89b67</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Christmas</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1b65a4f45cc018318368b23f7da6e9f1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>78e32232b4c9563521b1178292e99be2</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Cocos</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4bc74d878f6399a2cd98cbbead37587b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3ab1a4b77f94a0c3f9ed940bd9b3c2f2</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Comoro</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>379d2a695aa1d6d107be590c8b95ac1d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>879eb3167957c61c64124dab0ecbb50f</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Kerguelen</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e854dc48a0276f518b46adf65f338a47</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a11047abe096321e035ef3c15e87e580</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Mahe</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7caffc0b04929cecb6f4da84ca3c3664</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>eecf72296c7f28bb356da5af1dcbd181</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Maldives</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f97c205812b4d7cc6ce7c7f926936d01</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f72bd0ab0609e41586f0b8819c78e015</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Mauritius</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d0a212c3bfff2d3eb4be2d7a623e8e05</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1ef668c409d1c581977fd40fc7505481</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Mayotte</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8e9f8bd79d21fbbbb5ddf1e94a8e0bfe</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>de8757aa5b9a58932bac913852e921e7</md5>
   </timezone>
   <timezone>
     <tzid>Indian/Reunion</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ee1edd8f14571fca667f44ce6ca556f9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>741555128a2c97b186f5f050b397e4e5</md5>
   </timezone>
   <timezone>
     <tzid>Iran</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>254b93b06c4e8559b8784cfa8f4ceb82</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a3a23dd1119cd8362fd4019ba9e5a8ec</md5>
   </timezone>
   <timezone>
     <tzid>Israel</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>511a4f3bd79d9cffc83f6dc2a5371c6b</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ddc7408ffeda022e46aaaa72aaf228be</md5>
   </timezone>
   <timezone>
     <tzid>Jamaica</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>f63311b92b1fff9b7e37ac95fd05a706</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1f8889ee038dede3ef4868055adf897a</md5>
   </timezone>
   <timezone>
     <tzid>Japan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ab1b976c6c7e14224875a7ba8ab884bc</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ff59375f1fd8af619f193e904888c448</md5>
   </timezone>
   <timezone>
     <tzid>Kwajalein</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2d8a09ce01d1e53859125344f67af9b9</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>18865d3f0f1a93f2b96d77d8b63b86be</md5>
   </timezone>
   <timezone>
     <tzid>Libya</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>777b5dadc151693fff1610683ac98d88</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0946628c34cfcb3d3d019ef1493961ff</md5>
   </timezone>
   <timezone>
     <tzid>MET</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e845cf9a734871d08f5470975b583e7d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3176603f9d378e550950e8139ee1bfef</md5>
   </timezone>
   <timezone>
     <tzid>MST</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>21321000c39a3b2c967d9ba61e8e5970</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5db2edcdc9114abad158ab89eb658360</md5>
   </timezone>
   <timezone>
     <tzid>MST7MDT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6489b38dfd96a6759b1b0a4fc944e094</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d43bd95c6a43197ff72e084d1bebb875</md5>
   </timezone>
   <timezone>
     <tzid>Mexico/BajaNorte</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>03171c7f556dc761a0c65e32a620e24f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>7ccf81b88f1e609f28623b2d917dbbde</md5>
   </timezone>
   <timezone>
     <tzid>Mexico/BajaSur</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3467f1b8e5d39a25f69fbe8dfe192590</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8d51778693bcfb2b3e89fe2da5016786</md5>
   </timezone>
   <timezone>
     <tzid>Mexico/General</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>dc6639f5a4f32d3f095437ec42237033</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3b33093afd8c0a554948130f54cc23f4</md5>
   </timezone>
   <timezone>
     <tzid>NZ</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a7a403d2f1029a4ab621a34e3debd94f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6f3e44f4f50b3e2e6e8fa002734e37a2</md5>
   </timezone>
   <timezone>
     <tzid>NZ-CHAT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>dbe6877ea982ad43e2562dfbe22a44d7</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b7ab01dcc64ed6b0877b41a48a5f5bf1</md5>
   </timezone>
   <timezone>
     <tzid>Navajo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>09f0be86c9120759c0e5ef8fd578a11c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>46c72b3a055bd29862b55ac4bf1a62ed</md5>
   </timezone>
   <timezone>
     <tzid>PRC</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7a6c96a0e336cd323b7ecba0da2c5b8a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>36f302069bbea086137f096fd957a3ec</md5>
   </timezone>
   <timezone>
     <tzid>PST8PDT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>df438b76ce105eb522ba7ea5886df723</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b519fb841c7d3f389a584fdfa7372b93</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Apia</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e07a9fea53548911ed888c59dabf328e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>aef8f66329a5e26715f1375237691865</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Auckland</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>NZ</alias>
-    <md5>43742c853d5f857fd57b2847d4f736ad</md5>
+    <md5>31b52d15573225aff7940c24fbe45343</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Chatham</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>NZ-CHAT</alias>
-    <md5>af494699ee19988c4dd3cf6e8ba99e28</md5>
+    <md5>95a97b69d55aa2c0f804cc64e2c7372a</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Chuuk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Pacific/Truk</alias>
     <alias>Pacific/Yap</alias>
-    <md5>edf697313a6ec2df5211461821a361db</md5>
+    <md5>e27f3d75919a1cccffd60028972b0b69</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Easter</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Chile/EasterIsland</alias>
-    <md5>d9e3a90955fd7bc20cb8e06e83bbfa16</md5>
+    <md5>263c7e02c6aab8ff3976c3667234a804</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Efate</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ecab3823013b5231f5206fc6a54f0ab8</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9be7cc469122983be742519de9a5d279</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Enderbury</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2d7cb1a5c3a6ae23d9e1fbba773e9063</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0cc659854c0dc9f17c11d74823aa3b44</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Fakaofo</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8863e28156be6fe9579ab3dfc4f73d11</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>a8fa713b3ee90cef8fc79493481f1911</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Fiji</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>14b67550bfbf013adbafc48b01bbfa9a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d1f75438bb60b9c64143e10ee39d5c34</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Funafuti</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>73e0d79b4382f59ad1751dbaa34bc434</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8151c0448f128c96a822d59ebb336a0b</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Galapagos</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>436e928b179d64b69f368fec7b9683e1</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>36c139cfb7a806b0152535b4052bce12</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Gambier</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7082560be85745030298835ed0e8c734</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>146cdb3c5780a970b653600d5501ca9a</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Guadalcanal</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8c0404e1facaa3b76339ccacecbd6762</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ac17a77c46959df23f3d6d8f21ebf380</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Guam</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0494e2ea81ca8bffdd63c937c682940c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>77d1448c52ccbfe2608beb604b103060</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Honolulu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>US/Hawaii</alias>
-    <md5>01a66f2be316e7b40eefeb83e8e77be6</md5>
+    <md5>be013195b929c48b73f0234a5226a763</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Johnston</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>b5e61e04cd31d756a0f02b81bfeb48b3</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>fdd50497d420099a0f7faabcc47e967e</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Kiritimati</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>68de4d111a56e4ef0eb268afbeca8044</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>8f91b87bd5f890f31ed630cbdd65bfe0</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Kosrae</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3970c20d9f40401dd85d7ef96e1c4f3f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>d7026bbafd9c16c828faddbcbd54e187</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Kwajalein</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Kwajalein</alias>
-    <md5>65503ba52897d18a46a262a73f02a931</md5>
+    <md5>3f9fde4ba2943bb738e8c1924e0f096f</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Majuro</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>aae48e0261b08ff580c1dcdcf88c85e7</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0ba8b75760ab452f92b756af581b4f94</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Marquesas</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8083df31e2e3bd0c679d4d28962f1e72</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>c0b76e212cd626515ce49ccde8f9be8e</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Midway</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>7b063107e83ba78326f0a3b430c66875</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9272f8c6887fa8f574c5c5ba418f95b2</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Nauru</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>c7a502bdf1aab68e7537ee010f44a6ea</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0a61ad27dac0def1ead26816406e78c9</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Niue</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>140bc8f5d7bbeb88a633f8ae17f60d22</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>104f51b65268a84648497d4630f313f9</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Norfolk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ea6ba22f347bc510b94087e99b32ed6d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3d8fb92babf03f7aaa36ecc4e45b7cb1</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Noumea</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>fed390c911a3f700ddc19801db633e26</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>5a2e4e6bab69c3158bf4a6e26be36f08</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Pago_Pago</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>US/Samoa</alias>
     <alias>Pacific/Samoa</alias>
-    <md5>88d50883689e3b2bcc5e2c5c7c65fb52</md5>
+    <md5>4a94a3c2a6fd989abce492f2558c0c01</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Palau</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2ecfb1899ac3611cb2ee6355c31edf5e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e47c8195ec326afab7f697df36fe22c8</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Pitcairn</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bc6bcb2947080b897f8b5a69c42ddb97</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>1edbcbc683541d34dc1e9dfbd227e9d3</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Pohnpei</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
     <alias>Pacific/Ponape</alias>
-    <md5>99284b8e4ace3f271242f083a64bbec7</md5>
+    <md5>a35aee50c70f59e05ba2d55f1bdaeafd</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Ponape</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8e3c63bb26f2ea83a40bad65d6ce9d11</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>dfcf75fdd418cae92159911a6da346a8</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Port_Moresby</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2088ac9268ca879ac7861ac6cd07ecc7</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>042a04dfc570e2936ad064894529f41c</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Rarotonga</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bf72fd971f9d34cdf038d46c4f55ee0f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>09807d21db92730922a60125663d0368</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Saipan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8c4f128eff40bcf6724a42be810a7b40</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>cf05f7ec55a5e2279e28cfedb248ede3</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Samoa</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>cb9844b2c5ab155ecda31e42910a4b86</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0ef449f6efcf8af5e231acd565527b15</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Tahiti</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>64f9c28c36e1a38a8238c592d85d126e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9ea877f5d48d98918ea1209675906ff9</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Tarawa</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>0f043df0c42fc01870fa9ad491fa621f</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f081bd2e38ba54f76976c855d7127359</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Tongatapu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1df0d6ee4f9a2cde99f859f59a5e03e5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>2124717920b350ba81643915b321d139</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Truk</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1d89cc24b941b8565728168adcc19822</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f57c9c7a7b416fcdb8eb141ce553d0ab</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Wake</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4ea873023e61d888d4d8ebfa501c1f18</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>9ccddcd5565ba37cdf69b3b685eafcab</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Wallis</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>1b81253f838a09a884f2b81b8e51b059</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>bc5d9160c9a3c89b0fe7c90fa61a1d42</md5>
   </timezone>
   <timezone>
     <tzid>Pacific/Yap</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2100464c1d660a6ace68e9d207eaedae</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>721ea1e811f10f00a44b2079ceece1f3</md5>
   </timezone>
   <timezone>
     <tzid>Poland</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>33a1f92a2ccf5d1d2f03130239702b9d</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>95a5dc1d445e1abc4a5f3626f4552800</md5>
   </timezone>
   <timezone>
     <tzid>Portugal</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>bfd437807ef90134d3dc49cd5f6ff19a</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>84ac9b94013de10f1726ad9dada81743</md5>
   </timezone>
   <timezone>
     <tzid>ROC</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8622ca5e6054e73f32b7eef77c5a82d4</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>89de140cb0176610bffea12b53ad6d12</md5>
   </timezone>
   <timezone>
     <tzid>ROK</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>47bb8acc258dd8ac19abb4c5c987e55c</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>b4ce7399fc454c07647554d069239558</md5>
   </timezone>
   <timezone>
     <tzid>Singapore</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>5d8526426ea9b8954c8ed47f82cf2ab8</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>94dcb7e58cfd771fa8ec1bd1ea6a5248</md5>
   </timezone>
   <timezone>
     <tzid>Turkey</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>3451ed290d878ab1e668ec6c9b9d8c99</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>bf1f1275922c18a8271e890e1d137a89</md5>
   </timezone>
   <timezone>
     <tzid>UCT</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>341c04d57095a3a9aa2850b83bebb1bd</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>77ab109760c523113f36441e0a218999</md5>
   </timezone>
   <timezone>
     <tzid>US/Alaska</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>33e7f2f6afbdd0461937859cd0d6a1bb</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>0079a04f2e0aafab32b4d4230d97cfde</md5>
   </timezone>
   <timezone>
     <tzid>US/Aleutian</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>8c32ea8de3417b0f7954d6e5ce8908be</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>e2363554818e6b144bc767e60d7bddad</md5>
   </timezone>
   <timezone>
     <tzid>US/Arizona</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4f37c0e4bfa8e246fb385ab61201bb39</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>37d8a4aaa8f25545ab70a4adf0c3d9e4</md5>
   </timezone>
   <timezone>
     <tzid>US/Central</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>a04b79a29db61324da5f5e83650c3b60</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>bbd226d028c1b450541be5fbe0c01dae</md5>
   </timezone>
   <timezone>
     <tzid>US/East-Indiana</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>79b0dd4f35fe8607bb61a8d85b5fdee5</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>38b5608b46be56f329dde3dc8f0148fd</md5>
   </timezone>
   <timezone>
     <tzid>US/Eastern</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>22bc6f1e0d9828a2d180b1ce6483b029</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>6857581108bc470d0caf0024104714de</md5>
   </timezone>
   <timezone>
     <tzid>US/Hawaii</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>54116c5f57857a61c86c698046462edd</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>ec730fd926e64c6957fe2d1087016ed3</md5>
   </timezone>
   <timezone>
     <tzid>US/Indiana-Starke</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>04577aa85bfa16f4b9d9d48c6e48f776</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>4af48147902ca00f5d08bbae17d1af52</md5>
   </timezone>
   <timezone>
     <tzid>US/Michigan</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>745597bb69268eceb50faac185f18308</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>cae1c31df8990586c12f42180492e3a4</md5>
   </timezone>
   <timezone>
     <tzid>US/Mountain</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>d982832a6aee0f6081ce846e0bdb478e</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>85f5a54d3dd13f996d3ada4ac144ff4d</md5>
   </timezone>
   <timezone>
     <tzid>US/Pacific</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e5d5382ba8d275e201c3d6581abb85b6</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3ad0990bea538591e1790556c162f920</md5>
   </timezone>
   <timezone>
     <tzid>US/Samoa</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>e8705de5512988bd3c5b671cb684c160</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>25dab73c0f7efc3a997a2efa5466c12e</md5>
   </timezone>
   <timezone>
     <tzid>UTC</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>6c90373ab52559ca7a0abb2e245014ae</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3b4bdbd492aa1796c10f37c1969dbd4b</md5>
   </timezone>
   <timezone>
     <tzid>Universal</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>006d17434c50cfbb7473d0b887060173</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>50bcbcc5d95d03946dd65a7d53877ac7</md5>
   </timezone>
   <timezone>
     <tzid>W-SU</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>4b9f14691328dd4c0595586c8504a058</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>3fdc23a1e84d1e77026ef5134217ffa3</md5>
   </timezone>
   <timezone>
     <tzid>WET</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>2e8bf9ac5e45e798c9953a821e0bbd53</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>f7d652d5d227809a7c9a9d75fea34c08</md5>
   </timezone>
   <timezone>
     <tzid>Zulu</tzid>
-    <dtstamp>20110524T222343Z</dtstamp>
-    <md5>ee86469cac668e25e1619fd59d11f619</md5>
+    <dtstamp>2011-10-05T11:50:21Z</dtstamp>
+    <md5>fa5e48a172aaa63cbd2193b233b2d9a4</md5>
   </timezone>
 </timezones>

Modified: CalendarServer/trunk/twistedcaldav/zoneinfo/version.txt
===================================================================
--- CalendarServer/trunk/twistedcaldav/zoneinfo/version.txt	2011-10-06 10:46:29 UTC (rev 8148)
+++ CalendarServer/trunk/twistedcaldav/zoneinfo/version.txt	2011-10-06 11:06:10 UTC (rev 8149)
@@ -1 +1 @@
-Olson data source: tzdata2011b
+Olson data source: tzdata2011k
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111006/657bbbd8/attachment-0001.html>
