updated all files again, placing current RDATEs first, so Outlook uses

2001-10-22  Damon Chaplin  <damon@ximian.com>

	* zoneinfo/*: updated all files again, placing current RDATEs first,
	so Outlook uses those. Also fixed a few bugs in vzic which resulted in
	a few changes.

	* zoneinfo/Makefile.am (DIRS): added America/North_Dakota.

2001-10-22  Damon Chaplin  <damon@ximian.com>

	* src/libical/icaltimezone.c (icaltimezone_get_utc_offset):
	(icaltimezone_get_utc_offset_of_utc_time): if we go off the start of
	the changes array, return the TZOFFSETFROM of the first change.
	Also changed the maximum year to 2037.

	* src/libical/icaltime.c (icaltime_day_of_week):
	(icaltime_start_doy_of_week):
	(icaltime_week_number): init tm_hour to 12. Sometimes mktime()
	adjusts the time, if that local time doesn't actually exist, leading
	to the wrong day being returned. It is unlikely to adjust by 12 hours.
	(icaltime_as_timet_with_zone):
	(icaltime_from_timet_with_zone): change it back so it does convert
	DATE values to/from the timezone. time_t values don't really go well
	with DATE values, so be very careful when using them. We now assume
	that the time_t points to the start of the day in the given timezone.
	(We used to assume it pointed to the start of the day in UTC, but
	that meant it was actually incorrect wrt the displayed calendar.)

	* src/libical/icalrecur.c (expand_year_days): for FREQ=YEARLY with no
	modifiers, we add one day, using the month and day from DTSTART.
	(next_year): make sure we never go past 2037.

	* scripts/mkderivedproperties.pl: Updated to allow DTSTART, DTEND, DUE
	and RECURRENCE-ID to be set with DATE values. I think it now handles
	all properties which can take DATE values, except RDATE which uses
	DATE-TIME-PERIOD.

svn path=/trunk/; revision=13912

4 files changed, 315 insertions, 315 deletions

diff --git a/libical/zoneinfo/America/Indiana/Indianapolis.ics b/libical/zoneinfo/America/Indiana/Indianapolis.ics
index 8dc82b603a..15450235b1 100644
--- a/libical/zoneinfo/America/Indiana/Indianapolis.ics
+++ b/libical/zoneinfo/America/Indiana/Indianapolis.ics
@@ -2,107 +2,107 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/America/Indiana/Indianapolis
+TZID:/softwarestudio.org/Olson_20011022_4/America/Indiana/Indianapolis
 X-LIC-LOCATION:America/Indiana/Indianapolis
 BEGIN:STANDARD
-TZOFFSETFROM:-0545
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T120000
-RDATE:18831118T120000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19710101T000000
+RDATE:19710101T000000
+RDATE:19690101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19701025T020000
+RDATE:19701025T020000
+RDATE:19691026T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19700426T020000
+RDATE:19700426T020000
+RDATE:19690427T020000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RDATE:19180331T020000
-RDATE:19190330T020000
-RDATE:19410622T020000
-RDATE:19460428T020000
-RDATE:19470427T020000
-RDATE:19480425T020000
-RDATE:19490424T020000
-RDATE:19500430T020000
-RDATE:19510429T020000
-RDATE:19520427T020000
-RDATE:19530426T020000
-RDATE:19540425T020000
-END:DAYLIGHT
+TZNAME:EST
+DTSTART:19580427T020000
+RDATE:19580427T020000
+RDATE:19550424T020000
+END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
 TZNAME:CST
-DTSTART:19181027T020000
-RDATE:19181027T020000
-RDATE:19191026T020000
-RDATE:19410928T020000
-RDATE:19450930T020000
-RDATE:19460929T020000
-RDATE:19470928T020000
-RDATE:19480926T020000
-RDATE:19490925T020000
-RDATE:19500924T020000
-RDATE:19510930T020000
-RDATE:19520928T020000
-RDATE:19530927T020000
-RDATE:19540926T020000
+DTSTART:19570929T020000
 RDATE:19570929T020000
+RDATE:19540926T020000
+RDATE:19530927T020000
+RDATE:19520928T020000
+RDATE:19510930T020000
+RDATE:19500924T020000
+RDATE:19490925T020000
+RDATE:19480926T020000
+RDATE:19470928T020000
+RDATE:19460929T020000
+RDATE:19450930T020000
+RDATE:19410928T020000
+RDATE:19191026T020000
+RDATE:19181027T020000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+TZNAME:CDT
+DTSTART:19540425T020000
+RDATE:19540425T020000
+RDATE:19530426T020000
+RDATE:19520427T020000
+RDATE:19510429T020000
+RDATE:19500430T020000
+RDATE:19490424T020000
+RDATE:19480425T020000
+RDATE:19470427T020000
+RDATE:19460428T020000
+RDATE:19410622T020000
+RDATE:19190330T020000
+RDATE:19180331T020000
+END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
 TZNAME:CST
-DTSTART:19200101T000000
-RDATE:19200101T000000
-RDATE:19420101T000000
+DTSTART:19460101T000000
 RDATE:19460101T000000
+RDATE:19420101T000000
+RDATE:19200101T000000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
 TZNAME:CPT
 DTSTART:19450814T180000
 RDATE:19450814T180000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19550424T020000
-RDATE:19550424T020000
-RDATE:19580427T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19690101T000000
-RDATE:19690101T000000
-RDATE:19710101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RDATE:19690427T020000
-RDATE:19700426T020000
+TZNAME:CWT
+DTSTART:19420209T020000
+RDATE:19420209T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RDATE:19691026T020000
-RDATE:19701025T020000
+TZOFFSETFROM:-0545
+TZOFFSETTO:-0600
+TZNAME:CST
+DTSTART:18831118T120000
+RDATE:18831118T120000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/America/Indiana/Knox.ics b/libical/zoneinfo/America/Indiana/Knox.ics
index 7351eb3b1a..a31bfdbefc 100644
--- a/libical/zoneinfo/America/Indiana/Knox.ics
+++ b/libical/zoneinfo/America/Indiana/Knox.ics
@@ -2,126 +2,119 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/America/Indiana/Knox
+TZID:/softwarestudio.org/Olson_20011022_4/America/Indiana/Knox
 X-LIC-LOCATION:America/Indiana/Knox
 BEGIN:STANDARD
-TZOFFSETFROM:-0546
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T120000
-RDATE:18831118T120000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19911027T020000
+RDATE:19911027T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
 TZNAME:CDT
-DTSTART:19180331T020000
-RDATE:19180331T020000
-RDATE:19190330T020000
-RDATE:19470427T020000
-RDATE:19480425T020000
-RDATE:19490424T020000
-RDATE:19500430T020000
-RDATE:19510429T020000
-RDATE:19520427T020000
-RDATE:19530426T020000
-RDATE:19540425T020000
-RDATE:19550424T020000
-RDATE:19560429T020000
-RDATE:19570428T020000
-RDATE:19580427T020000
-RDATE:19590426T020000
-RDATE:19600424T020000
-RDATE:19610430T020000
-RDATE:19670430T020000
-RDATE:19680428T020000
-RDATE:19690427T020000
-RDATE:19700426T020000
-RDATE:19710425T020000
-RDATE:19720430T020000
-RDATE:19730429T020000
-RDATE:19740106T020000
-RDATE:19750223T020000
-RDATE:19760425T020000
-RDATE:19770424T020000
-RDATE:19780430T020000
-RDATE:19790429T020000
-RDATE:19800427T020000
-RDATE:19810426T020000
-RDATE:19820425T020000
-RDATE:19830424T020000
-RDATE:19840429T020000
-RDATE:19850428T020000
-RDATE:19860427T020000
-RDATE:19870405T020000
-RDATE:19880403T020000
-RDATE:19890402T020000
-RDATE:19900401T020000
+DTSTART:19910407T020000
 RDATE:19910407T020000
+RDATE:19900401T020000
+RDATE:19890402T020000
+RDATE:19880403T020000
+RDATE:19870405T020000
+RDATE:19860427T020000
+RDATE:19850428T020000
+RDATE:19840429T020000
+RDATE:19830424T020000
+RDATE:19820425T020000
+RDATE:19810426T020000
+RDATE:19800427T020000
+RDATE:19790429T020000
+RDATE:19780430T020000
+RDATE:19770424T020000
+RDATE:19760425T020000
+RDATE:19750223T020000
+RDATE:19740106T020000
+RDATE:19730429T020000
+RDATE:19720430T020000
+RDATE:19710425T020000
+RDATE:19700426T020000
+RDATE:19690427T020000
+RDATE:19680428T020000
+RDATE:19670430T020000
+RDATE:19610430T020000
+RDATE:19600424T020000
+RDATE:19590426T020000
+RDATE:19580427T020000
+RDATE:19570428T020000
+RDATE:19560429T020000
+RDATE:19550424T020000
+RDATE:19540425T020000
+RDATE:19530426T020000
+RDATE:19520427T020000
+RDATE:19510429T020000
+RDATE:19500430T020000
+RDATE:19490424T020000
+RDATE:19480425T020000
+RDATE:19470427T020000
+RDATE:19190330T020000
+RDATE:19180331T020000
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
 TZNAME:CST
-DTSTART:19181027T020000
-RDATE:19181027T020000
-RDATE:19191026T020000
-RDATE:19450930T020000
-RDATE:19470928T020000
-RDATE:19480926T020000
-RDATE:19490925T020000
-RDATE:19500924T020000
-RDATE:19510930T020000
-RDATE:19520928T020000
-RDATE:19530927T020000
-RDATE:19540926T020000
-RDATE:19551030T020000
-RDATE:19561028T020000
-RDATE:19570929T020000
-RDATE:19580928T020000
-RDATE:19591025T020000
-RDATE:19601030T020000
-RDATE:19611029T020000
-RDATE:19631027T020000
-RDATE:19671029T020000
-RDATE:19681027T020000
-RDATE:19691026T020000
-RDATE:19701025T020000
-RDATE:19711031T020000
-RDATE:19721029T020000
-RDATE:19731028T020000
-RDATE:19741027T020000
-RDATE:19751026T020000
-RDATE:19761031T020000
-RDATE:19771030T020000
-RDATE:19781029T020000
-RDATE:19791028T020000
-RDATE:19801026T020000
-RDATE:19811025T020000
-RDATE:19821031T020000
-RDATE:19831030T020000
-RDATE:19841028T020000
-RDATE:19851027T020000
-RDATE:19861026T020000
-RDATE:19871025T020000
-RDATE:19881030T020000
-RDATE:19891029T020000
+DTSTART:19901028T020000
 RDATE:19901028T020000
+RDATE:19891029T020000
+RDATE:19881030T020000
+RDATE:19871025T020000
+RDATE:19861026T020000
+RDATE:19851027T020000
+RDATE:19841028T020000
+RDATE:19831030T020000
+RDATE:19821031T020000
+RDATE:19811025T020000
+RDATE:19801026T020000
+RDATE:19791028T020000
+RDATE:19781029T020000
+RDATE:19771030T020000
+RDATE:19761031T020000
+RDATE:19751026T020000
+RDATE:19741027T020000
+RDATE:19731028T020000
+RDATE:19721029T020000
+RDATE:19711031T020000
+RDATE:19701025T020000
+RDATE:19691026T020000
+RDATE:19681027T020000
+RDATE:19671029T020000
+RDATE:19631027T020000
+RDATE:19611029T020000
+RDATE:19601030T020000
+RDATE:19591025T020000
+RDATE:19580928T020000
+RDATE:19570929T020000
+RDATE:19561028T020000
+RDATE:19551030T020000
+RDATE:19540926T020000
+RDATE:19530927T020000
+RDATE:19520928T020000
+RDATE:19510930T020000
+RDATE:19500924T020000
+RDATE:19490925T020000
+RDATE:19480926T020000
+RDATE:19470928T020000
+RDATE:19450930T020000
+RDATE:19191026T020000
+RDATE:19181027T020000
 END:STANDARD
-BEGIN:DAYLIGHT
+BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
-END:DAYLIGHT
+TZNAME:EST
+DTSTART:19620429T020000
+RDATE:19620429T020000
+END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0600
@@ -129,19 +122,26 @@ TZNAME:CST
 DTSTART:19470101T000000
 RDATE:19470101T000000
 END:STANDARD
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+TZNAME:CPT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19620429T020000
-RDATE:19620429T020000
-END:STANDARD
+TZNAME:CWT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19911027T020000
-RDATE:19911027T020000
+TZOFFSETFROM:-0546
+TZOFFSETTO:-0600
+TZNAME:CST
+DTSTART:18831118T120000
+RDATE:18831118T120000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/America/Indiana/Marengo.ics b/libical/zoneinfo/America/Indiana/Marengo.ics
index 88dbdb5314..1642fd9887 100644
--- a/libical/zoneinfo/America/Indiana/Marengo.ics
+++ b/libical/zoneinfo/America/Indiana/Marengo.ics
@@ -2,61 +2,87 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/America/Indiana/Marengo
+TZID:/softwarestudio.org/Olson_20011022_4/America/Indiana/Marengo
 X-LIC-LOCATION:America/Indiana/Marengo
 BEGIN:STANDARD
-TZOFFSETFROM:-0545
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T120000
-RDATE:18831118T120000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19760101T000000
+RDATE:19760101T000000
+RDATE:19741027T020000
+RDATE:19690101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19751026T020000
+RDATE:19751026T020000
+RDATE:19731028T020000
+RDATE:19721029T020000
+RDATE:19711031T020000
+RDATE:19701025T020000
+RDATE:19691026T020000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19750223T020000
+RDATE:19750223T020000
+RDATE:19730429T020000
+RDATE:19720430T020000
+RDATE:19710425T020000
+RDATE:19700426T020000
+RDATE:19690427T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
 TZNAME:CDT
-DTSTART:19180331T020000
-RDATE:19180331T020000
-RDATE:19190330T020000
-RDATE:19510429T020000
-RDATE:19540425T020000
-RDATE:19550424T020000
-RDATE:19560429T020000
-RDATE:19570428T020000
-RDATE:19580427T020000
-RDATE:19590426T020000
-RDATE:19600424T020000
+DTSTART:19740106T020000
+RDATE:19740106T020000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19610430T020000
+RDATE:19610430T020000
+END:STANDARD
+BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
 TZNAME:CST
-DTSTART:19181027T020000
-RDATE:19181027T020000
-RDATE:19191026T020000
-RDATE:19450930T020000
-RDATE:19510930T020000
-RDATE:19540926T020000
-RDATE:19550925T020000
-RDATE:19560930T020000
-RDATE:19570929T020000
-RDATE:19580928T020000
-RDATE:19590927T020000
+DTSTART:19600925T020000
 RDATE:19600925T020000
+RDATE:19590927T020000
+RDATE:19580928T020000
+RDATE:19570929T020000
+RDATE:19560930T020000
+RDATE:19550925T020000
+RDATE:19540926T020000
+RDATE:19510930T020000
+RDATE:19450930T020000
+RDATE:19191026T020000
+RDATE:19181027T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:CPT
-DTSTART:19450814T180000
-RDATE:19450814T180000
+TZNAME:CDT
+DTSTART:19600424T020000
+RDATE:19600424T020000
+RDATE:19590426T020000
+RDATE:19580427T020000
+RDATE:19570428T020000
+RDATE:19560429T020000
+RDATE:19550424T020000
+RDATE:19540425T020000
+RDATE:19510429T020000
+RDATE:19190330T020000
+RDATE:19180331T020000
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0600
@@ -65,52 +91,26 @@ TZNAME:CST
 DTSTART:19510101T000000
 RDATE:19510101T000000
 END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19610430T020000
-RDATE:19610430T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19690101T000000
-RDATE:19690101T000000
-RDATE:19741027T020000
-RDATE:19760101T000000
-END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RDATE:19690427T020000
-RDATE:19700426T020000
-RDATE:19710425T020000
-RDATE:19720430T020000
-RDATE:19730429T020000
-RDATE:19750223T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RDATE:19691026T020000
-RDATE:19701025T020000
-RDATE:19711031T020000
-RDATE:19721029T020000
-RDATE:19731028T020000
-RDATE:19751026T020000
-END:STANDARD
+TZNAME:CPT
+DTSTART:19450814T180000
+RDATE:19450814T180000
+END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
+TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19740106T020000
-RDATE:19740106T020000
+TZNAME:CWT
+DTSTART:19420209T020000
+RDATE:19420209T020000
 END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0545
+TZOFFSETTO:-0600
+TZNAME:CST
+DTSTART:18831118T120000
+RDATE:18831118T120000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/America/Indiana/Vevay.ics b/libical/zoneinfo/America/Indiana/Vevay.ics
index 721c5d5d1b..92cd49b49c 100644
--- a/libical/zoneinfo/America/Indiana/Vevay.ics
+++ b/libical/zoneinfo/America/Indiana/Vevay.ics
@@ -2,80 +2,80 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/America/Indiana/Vevay
+TZID:/softwarestudio.org/Olson_20011022_4/America/Indiana/Vevay
 X-LIC-LOCATION:America/Indiana/Vevay
 BEGIN:STANDARD
-TZOFFSETFROM:-0540
-TZOFFSETTO:-0600
-TZNAME:CST
-DTSTART:18831118T120000
-RDATE:18831118T120000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19730101T000000
+RDATE:19730101T000000
+RDATE:19690101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19721029T020000
+RDATE:19721029T020000
+RDATE:19711031T020000
+RDATE:19701025T020000
+RDATE:19691026T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19720430T020000
+RDATE:19720430T020000
+RDATE:19710425T020000
+RDATE:19700426T020000
+RDATE:19690427T020000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:CDT
-DTSTART:19180331T020000
-RDATE:19180331T020000
-RDATE:19190330T020000
-END:DAYLIGHT
+TZNAME:EST
+DTSTART:19540425T020000
+RDATE:19540425T020000
+END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0600
 TZNAME:CST
-DTSTART:19181027T020000
-RDATE:19181027T020000
-RDATE:19191026T020000
+DTSTART:19450930T020000
 RDATE:19450930T020000
+RDATE:19191026T020000
+RDATE:19181027T020000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CWT
-DTSTART:19420209T020000
-RDATE:19420209T020000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0500
 TZNAME:CPT
 DTSTART:19450814T180000
 RDATE:19450814T180000
 END:DAYLIGHT
-BEGIN:STANDARD
+BEGIN:DAYLIGHT
 TZOFFSETFROM:-0600
 TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19540425T020000
-RDATE:19540425T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19690101T000000
-RDATE:19690101T000000
-RDATE:19730101T000000
-END:STANDARD
+TZNAME:CWT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19690427T020000
-RDATE:19690427T020000
-RDATE:19700426T020000
-RDATE:19710425T020000
-RDATE:19720430T020000
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+TZNAME:CDT
+DTSTART:19190330T020000
+RDATE:19190330T020000
+RDATE:19180331T020000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19691026T020000
-RDATE:19691026T020000
-RDATE:19701025T020000
-RDATE:19711031T020000
-RDATE:19721029T020000
+TZOFFSETFROM:-0540
+TZOFFSETTO:-0600
+TZNAME:CST
+DTSTART:18831118T120000
+RDATE:18831118T120000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR