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

10 files changed, 627 insertions, 620 deletions

diff --git a/libical/zoneinfo/Atlantic/Azores.ics b/libical/zoneinfo/Atlantic/Azores.ics
index 87766b4ed4..fe19e29f36 100644
--- a/libical/zoneinfo/Atlantic/Azores.ics
+++ b/libical/zoneinfo/Atlantic/Azores.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/Azores
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/Azores
 X-LIC-LOCATION:Atlantic/Azores
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0100
@@ -19,205 +19,205 @@ DTSTART:19961027T010000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0143
-TZOFFSETTO:-0155
-TZNAME:HMT
-DTSTART:18840101T000000
-RDATE:18840101T000000
+TZOFFSETFROM:+0000
+TZOFFSETTO:-0100
+TZNAME:AZOT
+DTSTART:19950924T010000
+RDATE:19950924T010000
+RDATE:19940925T010000
+RDATE:19930926T010000
+RDATE:19910929T020000
+RDATE:19900930T020000
+RDATE:19890924T020000
+RDATE:19880925T020000
+RDATE:19870927T020000
+RDATE:19860928T020000
+RDATE:19850929T020000
+RDATE:19840930T020000
+RDATE:19830925T020000
+RDATE:19820926T020000
+RDATE:19810927T020000
+RDATE:19800928T020000
+RDATE:19790930T020000
+RDATE:19781001T010000
+RDATE:19770925T010000
 END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:AZOST
+DTSTART:19930328T010000
+RDATE:19930328T010000
+END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0155
-TZOFFSETTO:-0200
-TZNAME:AZOT
-DTSTART:19110524T000000
-RDATE:19110524T000000
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:WET
+DTSTART:19920927T020000
+RDATE:19920927T020000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
 TZNAME:AZOST
-DTSTART:19160617T230000
-RDATE:19160617T230000
-RDATE:19170228T230000
-RDATE:19180301T230000
-RDATE:19190228T230000
-RDATE:19200229T230000
-RDATE:19210228T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19310418T230000
-RDATE:19320402T230000
-RDATE:19340407T230000
-RDATE:19350330T230000
-RDATE:19360418T230000
-RDATE:19370403T230000
-RDATE:19380326T230000
-RDATE:19390415T230000
-RDATE:19400224T230000
-RDATE:19410405T230000
-RDATE:19420314T230000
-RDATE:19430313T230000
-RDATE:19440311T230000
-RDATE:19450310T230000
-RDATE:19460406T230000
-RDATE:19470406T020000
-RDATE:19480404T020000
-RDATE:19490403T020000
-RDATE:19510401T020000
-RDATE:19520406T020000
-RDATE:19530405T020000
-RDATE:19540404T020000
-RDATE:19550403T020000
-RDATE:19560401T020000
-RDATE:19570407T020000
-RDATE:19580406T020000
-RDATE:19590405T020000
-RDATE:19600403T020000
-RDATE:19610402T020000
-RDATE:19620401T020000
-RDATE:19630407T020000
-RDATE:19640405T020000
-RDATE:19650404T020000
+DTSTART:19920329T010000
+RDATE:19920329T010000
+RDATE:19910331T010000
+RDATE:19900325T010000
+RDATE:19890326T010000
+RDATE:19880327T010000
+RDATE:19870329T010000
+RDATE:19860330T010000
+RDATE:19850331T010000
+RDATE:19840325T010000
+RDATE:19830327T020000
+RDATE:19820328T010000
+RDATE:19810329T010000
+RDATE:19800330T000000
+RDATE:19790401T000000
+RDATE:19780402T000000
+RDATE:19770327T000000
 END:DAYLIGHT
 BEGIN:STANDARD
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+TZNAME:AZOT
+DTSTART:19660403T020000
+RDATE:19660403T020000
+END:STANDARD
+BEGIN:STANDARD
 TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
 TZNAME:AZOT
-DTSTART:19161101T010000
-RDATE:19161101T010000
-RDATE:19171015T000000
-RDATE:19181015T000000
-RDATE:19191015T000000
-RDATE:19201015T000000
-RDATE:19211015T000000
-RDATE:19241015T000000
-RDATE:19261003T000000
-RDATE:19271002T000000
-RDATE:19281007T000000
-RDATE:19291006T000000
-RDATE:19311004T000000
-RDATE:19321002T000000
-RDATE:19341007T000000
-RDATE:19351006T000000
-RDATE:19361004T000000
-RDATE:19371003T000000
-RDATE:19381002T000000
-RDATE:19391119T000000
-RDATE:19401006T000000
-RDATE:19411006T000000
-RDATE:19421025T000000
-RDATE:19431031T000000
-RDATE:19441029T000000
-RDATE:19451028T000000
-RDATE:19461006T000000
-RDATE:19471005T030000
-RDATE:19481003T030000
-RDATE:19491002T030000
-RDATE:19511007T030000
-RDATE:19521005T030000
-RDATE:19531004T030000
-RDATE:19541003T030000
-RDATE:19551002T030000
-RDATE:19561007T030000
-RDATE:19571006T030000
-RDATE:19581005T030000
-RDATE:19591004T030000
-RDATE:19601002T030000
-RDATE:19611001T030000
-RDATE:19621007T030000
-RDATE:19631006T030000
-RDATE:19641004T030000
+DTSTART:19651003T030000
 RDATE:19651003T030000
+RDATE:19641004T030000
+RDATE:19631006T030000
+RDATE:19621007T030000
+RDATE:19611001T030000
+RDATE:19601002T030000
+RDATE:19591004T030000
+RDATE:19581005T030000
+RDATE:19571006T030000
+RDATE:19561007T030000
+RDATE:19551002T030000
+RDATE:19541003T030000
+RDATE:19531004T030000
+RDATE:19521005T030000
+RDATE:19511007T030000
+RDATE:19491002T030000
+RDATE:19481003T030000
+RDATE:19471005T030000
+RDATE:19461006T000000
+RDATE:19451028T000000
+RDATE:19441029T000000
+RDATE:19431031T000000
+RDATE:19421025T000000
+RDATE:19411006T000000
+RDATE:19401006T000000
+RDATE:19391119T000000
+RDATE:19381002T000000
+RDATE:19371003T000000
+RDATE:19361004T000000
+RDATE:19351006T000000
+RDATE:19341007T000000
+RDATE:19321002T000000
+RDATE:19311004T000000
+RDATE:19291006T000000
+RDATE:19281007T000000
+RDATE:19271002T000000
+RDATE:19261003T000000
+RDATE:19241015T000000
+RDATE:19211015T000000
+RDATE:19201015T000000
+RDATE:19191015T000000
+RDATE:19181015T000000
+RDATE:19171015T000000
+RDATE:19161101T010000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:AZOMT
-DTSTART:19420425T230000
-RDATE:19420425T230000
-RDATE:19430417T230000
-RDATE:19440422T230000
-RDATE:19450421T230000
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+TZNAME:AZOST
+DTSTART:19650404T020000
+RDATE:19650404T020000
+RDATE:19640405T020000
+RDATE:19630407T020000
+RDATE:19620401T020000
+RDATE:19610402T020000
+RDATE:19600403T020000
+RDATE:19590405T020000
+RDATE:19580406T020000
+RDATE:19570407T020000
+RDATE:19560401T020000
+RDATE:19550403T020000
+RDATE:19540404T020000
+RDATE:19530405T020000
+RDATE:19520406T020000
+RDATE:19510401T020000
+RDATE:19490403T020000
+RDATE:19480404T020000
+RDATE:19470406T020000
+RDATE:19460406T230000
+RDATE:19450310T230000
+RDATE:19440311T230000
+RDATE:19430313T230000
+RDATE:19420314T230000
+RDATE:19410405T230000
+RDATE:19400224T230000
+RDATE:19390415T230000
+RDATE:19380326T230000
+RDATE:19370403T230000
+RDATE:19360418T230000
+RDATE:19350330T230000
+RDATE:19340407T230000
+RDATE:19320402T230000
+RDATE:19310418T230000
+RDATE:19290420T230000
+RDATE:19280414T230000
+RDATE:19270409T230000
+RDATE:19260417T230000
+RDATE:19240416T230000
+RDATE:19210228T230000
+RDATE:19200229T230000
+RDATE:19190228T230000
+RDATE:19180301T230000
+RDATE:19170228T230000
+RDATE:19160617T230000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
 TZNAME:AZOST
-DTSTART:19420816T000000
-RDATE:19420816T000000
-RDATE:19430829T000000
-RDATE:19440827T000000
+DTSTART:19450826T000000
 RDATE:19450826T000000
+RDATE:19440827T000000
+RDATE:19430829T000000
+RDATE:19420816T000000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:AZOT
-DTSTART:19660403T020000
-RDATE:19660403T020000
-END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:AZOST
-DTSTART:19770327T000000
-RDATE:19770327T000000
-RDATE:19780402T000000
-RDATE:19790401T000000
-RDATE:19800330T000000
-RDATE:19810329T010000
-RDATE:19820328T010000
-RDATE:19830327T020000
-RDATE:19840325T010000
-RDATE:19850331T010000
-RDATE:19860330T010000
-RDATE:19870329T010000
-RDATE:19880327T010000
-RDATE:19890326T010000
-RDATE:19900325T010000
-RDATE:19910331T010000
-RDATE:19920329T010000
+TZNAME:AZOMT
+DTSTART:19450421T230000
+RDATE:19450421T230000
+RDATE:19440422T230000
+RDATE:19430417T230000
+RDATE:19420425T230000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
+TZOFFSETFROM:-0155
+TZOFFSETTO:-0200
 TZNAME:AZOT
-DTSTART:19770925T010000
-RDATE:19770925T010000
-RDATE:19781001T010000
-RDATE:19790930T020000
-RDATE:19800928T020000
-RDATE:19810927T020000
-RDATE:19820926T020000
-RDATE:19830925T020000
-RDATE:19840930T020000
-RDATE:19850929T020000
-RDATE:19860928T020000
-RDATE:19870927T020000
-RDATE:19880925T020000
-RDATE:19890924T020000
-RDATE:19900930T020000
-RDATE:19910929T020000
-RDATE:19930328T010000
-RDATE:19940925T010000
-RDATE:19950924T010000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19920927T020000
-RDATE:19920927T020000
+DTSTART:19110524T000000
+RDATE:19110524T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:-0100
-TZNAME:AZOT
-DTSTART:19930926T000000
-RDATE:19930926T000000
+TZOFFSETFROM:-0143
+TZOFFSETTO:-0155
+TZNAME:HMT
+DTSTART:18840101T000000
+RDATE:18840101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Atlantic/Bermuda.ics b/libical/zoneinfo/Atlantic/Bermuda.ics
index aae2cc46e0..2739e80749 100644
--- a/libical/zoneinfo/Atlantic/Bermuda.ics
+++ b/libical/zoneinfo/Atlantic/Bermuda.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/Bermuda
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/Bermuda
 X-LIC-LOCATION:Atlantic/Bermuda
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
@@ -18,6 +18,25 @@ TZNAME:ADT
 DTSTART:19870405T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
 END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+TZNAME:ADT
+DTSTART:19860427T020000
+RDATE:19860427T020000
+RDATE:19850428T020000
+RDATE:19840429T020000
+RDATE:19830424T020000
+RDATE:19820425T020000
+RDATE:19810426T020000
+RDATE:19800427T020000
+RDATE:19790429T020000
+RDATE:19780430T020000
+RDATE:19770424T020000
+RDATE:19760425T020000
+RDATE:19750427T020000
+RDATE:19740428T020000
+END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0419
 TZOFFSETTO:-0400
@@ -25,24 +44,5 @@ TZNAME:AST
 DTSTART:19300101T020000
 RDATE:19300101T020000
 END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:ADT
-DTSTART:19740428T020000
-RDATE:19740428T020000
-RDATE:19750427T020000
-RDATE:19760425T020000
-RDATE:19770424T020000
-RDATE:19780430T020000
-RDATE:19790429T020000
-RDATE:19800427T020000
-RDATE:19810426T020000
-RDATE:19820425T020000
-RDATE:19830424T020000
-RDATE:19840429T020000
-RDATE:19850428T020000
-RDATE:19860427T020000
-END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Atlantic/Canary.ics b/libical/zoneinfo/Atlantic/Canary.ics
index 737e6b8926..7f9aca2b11 100644
--- a/libical/zoneinfo/Atlantic/Canary.ics
+++ b/libical/zoneinfo/Atlantic/Canary.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/Canary
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/Canary
 X-LIC-LOCATION:Atlantic/Canary
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
@@ -19,20 +19,35 @@ DTSTART:19961027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0102
-TZOFFSETTO:-0100
-TZNAME:CANT
-DTSTART:19220301T000000
-RDATE:19220301T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
 TZNAME:WET
-DTSTART:19460930T010000
-RDATE:19460930T010000
+DTSTART:19950924T020000
+RDATE:19950924T020000
+RDATE:19940925T020000
+RDATE:19930926T020000
+RDATE:19920927T020000
+RDATE:19910929T020000
+RDATE:19900930T020000
+RDATE:19890924T020000
+RDATE:19880925T020000
+RDATE:19870927T020000
+RDATE:19860928T020000
+RDATE:19850929T020000
+RDATE:19840930T020000
+RDATE:19830925T020000
+RDATE:19820926T020000
+RDATE:19810927T020000
+RDATE:19800928T020000
 END:STANDARD
 BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WEST
+DTSTART:19800928T010000
+RDATE:19800928T010000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
 TZNAME:WEST
@@ -40,26 +55,18 @@ DTSTART:19800406T000000
 RDATE:19800406T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:WET
-DTSTART:19800928T020000
-RDATE:19800928T020000
-RDATE:19810927T020000
-RDATE:19820926T020000
-RDATE:19830925T020000
-RDATE:19840930T020000
-RDATE:19850929T020000
-RDATE:19860928T020000
-RDATE:19870927T020000
-RDATE:19880925T020000
-RDATE:19890924T020000
-RDATE:19900930T020000
-RDATE:19910929T020000
-RDATE:19920927T020000
-RDATE:19930926T020000
-RDATE:19940925T020000
-RDATE:19950924T020000
+DTSTART:19460930T010000
+RDATE:19460930T010000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0102
+TZOFFSETTO:-0100
+TZNAME:CANT
+DTSTART:19220301T000000
+RDATE:19220301T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Atlantic/Cape_Verde.ics b/libical/zoneinfo/Atlantic/Cape_Verde.ics
index 59c9b7f4e4..6a3754f65d 100644
--- a/libical/zoneinfo/Atlantic/Cape_Verde.ics
+++ b/libical/zoneinfo/Atlantic/Cape_Verde.ics
@@ -2,14 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/Cape_Verde
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/Cape_Verde
 X-LIC-LOCATION:Atlantic/Cape_Verde
 BEGIN:STANDARD
-TZOFFSETFROM:-0134
+TZOFFSETFROM:-0200
+TZOFFSETTO:-0100
+TZNAME:CVT
+DTSTART:19751125T020000
+RDATE:19751125T020000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0100
 TZOFFSETTO:-0200
 TZNAME:CVT
-DTSTART:19070101T000000
-RDATE:19070101T000000
+DTSTART:19451015T000000
+RDATE:19451015T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0200
@@ -19,18 +26,11 @@ DTSTART:19420901T000000
 RDATE:19420901T000000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
+TZOFFSETFROM:-0134
 TZOFFSETTO:-0200
 TZNAME:CVT
-DTSTART:19451015T000000
-RDATE:19451015T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0200
-TZOFFSETTO:-0100
-TZNAME:CVT
-DTSTART:19751125T020000
-RDATE:19751125T020000
+DTSTART:19070101T000000
+RDATE:19070101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Atlantic/Faeroe.ics b/libical/zoneinfo/Atlantic/Faeroe.ics
index 3877690814..f2063e6816 100644
--- a/libical/zoneinfo/Atlantic/Faeroe.ics
+++ b/libical/zoneinfo/Atlantic/Faeroe.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/Faeroe
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/Faeroe
 X-LIC-LOCATION:Atlantic/Faeroe
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
@@ -19,11 +19,25 @@ DTSTART:19961027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0027
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
 TZNAME:WET
-DTSTART:19080111T000000
-RDATE:19080111T000000
+DTSTART:19950924T020000
+RDATE:19950924T020000
+RDATE:19940925T020000
+RDATE:19930926T020000
+RDATE:19920927T020000
+RDATE:19910929T020000
+RDATE:19900930T020000
+RDATE:19890924T020000
+RDATE:19880925T020000
+RDATE:19870927T020000
+RDATE:19860928T020000
+RDATE:19850929T020000
+RDATE:19840930T020000
+RDATE:19830925T020000
+RDATE:19820926T020000
+RDATE:19810927T020000
 END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
@@ -33,25 +47,11 @@ DTSTART:19810101T000000
 RDATE:19810101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZOFFSETFROM:-0027
 TZOFFSETTO:+0000
 TZNAME:WET
-DTSTART:19810927T020000
-RDATE:19810927T020000
-RDATE:19820926T020000
-RDATE:19830925T020000
-RDATE:19840930T020000
-RDATE:19850929T020000
-RDATE:19860928T020000
-RDATE:19870927T020000
-RDATE:19880925T020000
-RDATE:19890924T020000
-RDATE:19900930T020000
-RDATE:19910929T020000
-RDATE:19920927T020000
-RDATE:19930926T020000
-RDATE:19940925T020000
-RDATE:19950924T020000
+DTSTART:19080111T000000
+RDATE:19080111T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Atlantic/Jan_Mayen.ics b/libical/zoneinfo/Atlantic/Jan_Mayen.ics
index ff5e959c88..fe2cb83aac 100644
--- a/libical/zoneinfo/Atlantic/Jan_Mayen.ics
+++ b/libical/zoneinfo/Atlantic/Jan_Mayen.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/Jan_Mayen
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/Jan_Mayen
 X-LIC-LOCATION:Atlantic/Jan_Mayen
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
@@ -19,71 +19,71 @@ DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0043
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 TZNAME:CET
-DTSTART:18950101T000000
-RDATE:18950101T000000
+DTSTART:19950924T030000
+RDATE:19950924T030000
+RDATE:19940925T030000
+RDATE:19930926T030000
+RDATE:19920927T030000
+RDATE:19910929T030000
+RDATE:19900930T030000
+RDATE:19890924T030000
+RDATE:19880925T030000
+RDATE:19870927T030000
+RDATE:19860928T030000
+RDATE:19850929T030000
+RDATE:19840930T030000
+RDATE:19830925T030000
+RDATE:19820926T030000
+RDATE:19810927T030000
+RDATE:19800928T030000
+RDATE:19650919T030000
+RDATE:19640920T030000
+RDATE:19630915T030000
+RDATE:19620916T030000
+RDATE:19610917T030000
+RDATE:19600918T030000
+RDATE:19590920T030000
+RDATE:19451001T030000
+RDATE:19441002T030000
+RDATE:19431004T030000
+RDATE:19421102T030000
+RDATE:19160930T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
 TZNAME:CEST
-DTSTART:19160522T010000
-RDATE:19160522T010000
-RDATE:19430329T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19590315T020000
-RDATE:19600320T020000
-RDATE:19610319T020000
-RDATE:19620318T020000
-RDATE:19630317T020000
-RDATE:19640315T020000
-RDATE:19650425T020000
+DTSTART:19800406T020000
 RDATE:19800406T020000
+RDATE:19650425T020000
+RDATE:19640315T020000
+RDATE:19630317T020000
+RDATE:19620318T020000
+RDATE:19610319T020000
+RDATE:19600320T020000
+RDATE:19590315T020000
+RDATE:19450402T020000
+RDATE:19440403T020000
+RDATE:19430329T020000
+RDATE:19400810T230000
+RDATE:19160522T010000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
+TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
 TZNAME:CET
-DTSTART:19160930T000000
-RDATE:19160930T000000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451001T030000
-RDATE:19590920T030000
-RDATE:19600918T030000
-RDATE:19610917T030000
-RDATE:19620916T030000
-RDATE:19630915T030000
-RDATE:19640920T030000
-RDATE:19650919T030000
-RDATE:19800928T030000
-RDATE:19810927T030000
-RDATE:19820926T030000
-RDATE:19830925T030000
-RDATE:19840930T030000
-RDATE:19850929T030000
-RDATE:19860928T030000
-RDATE:19870927T030000
-RDATE:19880925T030000
-RDATE:19890924T030000
-RDATE:19900930T030000
-RDATE:19910929T030000
-RDATE:19920927T030000
-RDATE:19930926T030000
-RDATE:19940925T030000
-RDATE:19950924T030000
+DTSTART:19800101T000000
+RDATE:19800101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZOFFSETFROM:+0043
 TZOFFSETTO:+0100
 TZNAME:CET
-DTSTART:19400810T230000
-RDATE:19400810T230000
-RDATE:19421102T020000
-RDATE:19800101T000000
+DTSTART:18950101T000000
+RDATE:18950101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Atlantic/Madeira.ics b/libical/zoneinfo/Atlantic/Madeira.ics
index 646b72a324..7c49443d3f 100644
--- a/libical/zoneinfo/Atlantic/Madeira.ics
+++ b/libical/zoneinfo/Atlantic/Madeira.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/Madeira
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/Madeira
 X-LIC-LOCATION:Atlantic/Madeira
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
@@ -19,183 +19,183 @@ DTSTART:19961027T020000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0108
-TZOFFSETTO:-0108
-TZNAME:FMT
-DTSTART:18840101T000000
-RDATE:18840101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0108
-TZOFFSETTO:-0100
-TZNAME:MADT
-DTSTART:19110524T000000
-RDATE:19110524T000000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+TZNAME:WET
+DTSTART:19950924T020000
+RDATE:19950924T020000
+RDATE:19940925T020000
+RDATE:19930926T020000
+RDATE:19920927T020000
+RDATE:19910929T020000
+RDATE:19900930T020000
+RDATE:19890924T020000
+RDATE:19880925T020000
+RDATE:19870927T020000
+RDATE:19860928T020000
+RDATE:19850929T020000
+RDATE:19840930T020000
+RDATE:19830925T020000
+RDATE:19820926T020000
+RDATE:19810927T020000
+RDATE:19800928T020000
+RDATE:19790930T020000
+RDATE:19781001T010000
+RDATE:19770925T010000
 END:STANDARD
 BEGIN:DAYLIGHT
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+TZNAME:WEST
+DTSTART:19830327T020000
+RDATE:19830327T020000
+RDATE:19820328T010000
+RDATE:19810329T010000
+RDATE:19800330T000000
+RDATE:19790401T000000
+RDATE:19780402T000000
+RDATE:19770327T000000
+END:DAYLIGHT
+BEGIN:STANDARD
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
-TZNAME:MADST
-DTSTART:19160617T230000
-RDATE:19160617T230000
-RDATE:19170228T230000
-RDATE:19180301T230000
-RDATE:19190228T230000
-RDATE:19200229T230000
-RDATE:19210228T230000
-RDATE:19240416T230000
-RDATE:19260417T230000
-RDATE:19270409T230000
-RDATE:19280414T230000
-RDATE:19290420T230000
-RDATE:19310418T230000
-RDATE:19320402T230000
-RDATE:19340407T230000
-RDATE:19350330T230000
-RDATE:19360418T230000
-RDATE:19370403T230000
-RDATE:19380326T230000
-RDATE:19390415T230000
-RDATE:19400224T230000
-RDATE:19410405T230000
-RDATE:19420314T230000
-RDATE:19430313T230000
-RDATE:19440311T230000
-RDATE:19450310T230000
-RDATE:19460406T230000
-RDATE:19470406T020000
-RDATE:19480404T020000
-RDATE:19490403T020000
-RDATE:19510401T020000
-RDATE:19520406T020000
-RDATE:19530405T020000
-RDATE:19540404T020000
-RDATE:19550403T020000
-RDATE:19560401T020000
-RDATE:19570407T020000
-RDATE:19580406T020000
-RDATE:19590405T020000
-RDATE:19600403T020000
-RDATE:19610402T020000
-RDATE:19620401T020000
-RDATE:19630407T020000
-RDATE:19640405T020000
-RDATE:19650404T020000
-END:DAYLIGHT
+TZNAME:WET
+DTSTART:19660403T020000
+RDATE:19660403T020000
+END:STANDARD
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
 TZNAME:MADT
-DTSTART:19161101T010000
-RDATE:19161101T010000
-RDATE:19171015T000000
-RDATE:19181015T000000
-RDATE:19191015T000000
-RDATE:19201015T000000
-RDATE:19211015T000000
-RDATE:19241015T000000
-RDATE:19261003T000000
-RDATE:19271002T000000
-RDATE:19281007T000000
-RDATE:19291006T000000
-RDATE:19311004T000000
-RDATE:19321002T000000
-RDATE:19341007T000000
-RDATE:19351006T000000
-RDATE:19361004T000000
-RDATE:19371003T000000
-RDATE:19381002T000000
-RDATE:19391119T000000
-RDATE:19401006T000000
-RDATE:19411006T000000
-RDATE:19421025T000000
-RDATE:19431031T000000
-RDATE:19441029T000000
-RDATE:19451028T000000
-RDATE:19461006T000000
-RDATE:19471005T030000
-RDATE:19481003T030000
-RDATE:19491002T030000
-RDATE:19511007T030000
-RDATE:19521005T030000
-RDATE:19531004T030000
-RDATE:19541003T030000
-RDATE:19551002T030000
-RDATE:19561007T030000
-RDATE:19571006T030000
-RDATE:19581005T030000
-RDATE:19591004T030000
-RDATE:19601002T030000
-RDATE:19611001T030000
-RDATE:19621007T030000
-RDATE:19631006T030000
-RDATE:19641004T030000
+DTSTART:19651003T030000
 RDATE:19651003T030000
+RDATE:19641004T030000
+RDATE:19631006T030000
+RDATE:19621007T030000
+RDATE:19611001T030000
+RDATE:19601002T030000
+RDATE:19591004T030000
+RDATE:19581005T030000
+RDATE:19571006T030000
+RDATE:19561007T030000
+RDATE:19551002T030000
+RDATE:19541003T030000
+RDATE:19531004T030000
+RDATE:19521005T030000
+RDATE:19511007T030000
+RDATE:19491002T030000
+RDATE:19481003T030000
+RDATE:19471005T030000
+RDATE:19461006T000000
+RDATE:19451028T000000
+RDATE:19441029T000000
+RDATE:19431031T000000
+RDATE:19421025T000000
+RDATE:19411006T000000
+RDATE:19401006T000000
+RDATE:19391119T000000
+RDATE:19381002T000000
+RDATE:19371003T000000
+RDATE:19361004T000000
+RDATE:19351006T000000
+RDATE:19341007T000000
+RDATE:19321002T000000
+RDATE:19311004T000000
+RDATE:19291006T000000
+RDATE:19281007T000000
+RDATE:19271002T000000
+RDATE:19261003T000000
+RDATE:19241015T000000
+RDATE:19211015T000000
+RDATE:19201015T000000
+RDATE:19191015T000000
+RDATE:19181015T000000
+RDATE:19171015T000000
+RDATE:19161101T010000
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:MADMT
-DTSTART:19420425T230000
-RDATE:19420425T230000
-RDATE:19430417T230000
-RDATE:19440422T230000
-RDATE:19450421T230000
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+TZNAME:MADST
+DTSTART:19650404T020000
+RDATE:19650404T020000
+RDATE:19640405T020000
+RDATE:19630407T020000
+RDATE:19620401T020000
+RDATE:19610402T020000
+RDATE:19600403T020000
+RDATE:19590405T020000
+RDATE:19580406T020000
+RDATE:19570407T020000
+RDATE:19560401T020000
+RDATE:19550403T020000
+RDATE:19540404T020000
+RDATE:19530405T020000
+RDATE:19520406T020000
+RDATE:19510401T020000
+RDATE:19490403T020000
+RDATE:19480404T020000
+RDATE:19470406T020000
+RDATE:19460406T230000
+RDATE:19450310T230000
+RDATE:19440311T230000
+RDATE:19430313T230000
+RDATE:19420314T230000
+RDATE:19410405T230000
+RDATE:19400224T230000
+RDATE:19390415T230000
+RDATE:19380326T230000
+RDATE:19370403T230000
+RDATE:19360418T230000
+RDATE:19350330T230000
+RDATE:19340407T230000
+RDATE:19320402T230000
+RDATE:19310418T230000
+RDATE:19290420T230000
+RDATE:19280414T230000
+RDATE:19270409T230000
+RDATE:19260417T230000
+RDATE:19240416T230000
+RDATE:19210228T230000
+RDATE:19200229T230000
+RDATE:19190228T230000
+RDATE:19180301T230000
+RDATE:19170228T230000
+RDATE:19160617T230000
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0000
 TZNAME:MADST
-DTSTART:19420816T000000
-RDATE:19420816T000000
-RDATE:19430829T000000
-RDATE:19440827T000000
+DTSTART:19450826T000000
 RDATE:19450826T000000
+RDATE:19440827T000000
+RDATE:19430829T000000
+RDATE:19420816T000000
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19660403T020000
-RDATE:19660403T020000
-END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0000
 TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19770327T000000
-RDATE:19770327T000000
-RDATE:19780402T000000
-RDATE:19790401T000000
-RDATE:19800330T000000
-RDATE:19810329T010000
-RDATE:19820328T010000
-RDATE:19830327T020000
+TZNAME:MADMT
+DTSTART:19450421T230000
+RDATE:19450421T230000
+RDATE:19440422T230000
+RDATE:19430417T230000
+RDATE:19420425T230000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19770925T010000
-RDATE:19770925T010000
-RDATE:19781001T010000
-RDATE:19790930T020000
-RDATE:19800928T020000
-RDATE:19810927T020000
-RDATE:19820926T020000
-RDATE:19830925T020000
-RDATE:19840930T020000
-RDATE:19850929T020000
-RDATE:19860928T020000
-RDATE:19870927T020000
-RDATE:19880925T020000
-RDATE:19890924T020000
-RDATE:19900930T020000
-RDATE:19910929T020000
-RDATE:19920927T020000
-RDATE:19930926T020000
-RDATE:19940925T020000
-RDATE:19950924T020000
+TZOFFSETFROM:-0108
+TZOFFSETTO:-0100
+TZNAME:MADT
+DTSTART:19110524T000000
+RDATE:19110524T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0108
+TZOFFSETTO:-0108
+TZNAME:FMT
+DTSTART:18840101T000000
+RDATE:18840101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Atlantic/Reykjavik.ics b/libical/zoneinfo/Atlantic/Reykjavik.ics
index 7f57a095a8..4c25274e73 100644
--- a/libical/zoneinfo/Atlantic/Reykjavik.ics
+++ b/libical/zoneinfo/Atlantic/Reykjavik.ics
@@ -2,102 +2,102 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/Reykjavik
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/Reykjavik
 X-LIC-LOCATION:Atlantic/Reykjavik
 BEGIN:STANDARD
-TZOFFSETFROM:-0127
-TZOFFSETTO:-0128
-TZNAME:RMT
-DTSTART:18370101T000000
-RDATE:18370101T000000
+TZOFFSETFROM:-0100
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19680407T010000
+RDATE:19680407T010000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0128
+TZOFFSETFROM:+0000
 TZOFFSETTO:-0100
 TZNAME:IST
-DTSTART:19080101T000000
-RDATE:19080101T000000
+DTSTART:19671029T020000
+RDATE:19671029T020000
+RDATE:19661023T020000
+RDATE:19651024T020000
+RDATE:19641025T020000
+RDATE:19631027T020000
+RDATE:19621028T020000
+RDATE:19611022T020000
+RDATE:19601023T020000
+RDATE:19591025T020000
+RDATE:19581026T020000
+RDATE:19571027T020000
+RDATE:19561028T020000
+RDATE:19551023T020000
+RDATE:19541024T020000
+RDATE:19531025T020000
+RDATE:19521026T020000
+RDATE:19511028T020000
+RDATE:19501022T020000
+RDATE:19491030T020000
+RDATE:19481024T020000
+RDATE:19471026T020000
+RDATE:19461027T020000
+RDATE:19451028T020000
+RDATE:19441022T020000
+RDATE:19431024T020000
+RDATE:19421025T020000
+RDATE:19411102T020000
+RDATE:19401103T020000
+RDATE:19391129T020000
+RDATE:19181116T010000
+RDATE:19171021T010000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:ISST
-DTSTART:19170219T230000
-RDATE:19170219T230000
-RDATE:19180219T230000
-RDATE:19390429T230000
-RDATE:19400225T020000
-RDATE:19410302T010000
-RDATE:19420308T010000
-RDATE:19430307T010000
-RDATE:19440305T010000
-RDATE:19450304T010000
-RDATE:19460303T010000
-RDATE:19470406T010000
-RDATE:19480404T010000
-RDATE:19490403T010000
-RDATE:19500402T010000
-RDATE:19510401T010000
-RDATE:19520406T010000
-RDATE:19530405T010000
-RDATE:19540404T010000
-RDATE:19550403T010000
-RDATE:19560401T010000
-RDATE:19570407T010000
-RDATE:19580406T010000
-RDATE:19590405T010000
-RDATE:19600403T010000
-RDATE:19610402T010000
-RDATE:19620401T010000
-RDATE:19630407T010000
-RDATE:19640405T010000
-RDATE:19650404T010000
-RDATE:19660403T010000
+DTSTART:19670402T010000
 RDATE:19670402T010000
+RDATE:19660403T010000
+RDATE:19650404T010000
+RDATE:19640405T010000
+RDATE:19630407T010000
+RDATE:19620401T010000
+RDATE:19610402T010000
+RDATE:19600403T010000
+RDATE:19590405T010000
+RDATE:19580406T010000
+RDATE:19570407T010000
+RDATE:19560401T010000
+RDATE:19550403T010000
+RDATE:19540404T010000
+RDATE:19530405T010000
+RDATE:19520406T010000
+RDATE:19510401T010000
+RDATE:19500402T010000
+RDATE:19490403T010000
+RDATE:19480404T010000
+RDATE:19470406T010000
+RDATE:19460303T010000
+RDATE:19450304T010000
+RDATE:19440305T010000
+RDATE:19430307T010000
+RDATE:19420308T010000
+RDATE:19410302T010000
+RDATE:19400225T020000
+RDATE:19390429T230000
+RDATE:19180219T230000
+RDATE:19170219T230000
 END:DAYLIGHT
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+TZOFFSETFROM:-0128
 TZOFFSETTO:-0100
 TZNAME:IST
-DTSTART:19171021T010000
-RDATE:19171021T010000
-RDATE:19181116T010000
-RDATE:19391129T020000
-RDATE:19401103T020000
-RDATE:19411102T020000
-RDATE:19421025T020000
-RDATE:19431024T020000
-RDATE:19441022T020000
-RDATE:19451028T020000
-RDATE:19461027T020000
-RDATE:19471026T020000
-RDATE:19481024T020000
-RDATE:19491030T020000
-RDATE:19501022T020000
-RDATE:19511028T020000
-RDATE:19521026T020000
-RDATE:19531025T020000
-RDATE:19541024T020000
-RDATE:19551023T020000
-RDATE:19561028T020000
-RDATE:19571027T020000
-RDATE:19581026T020000
-RDATE:19591025T020000
-RDATE:19601023T020000
-RDATE:19611022T020000
-RDATE:19621028T020000
-RDATE:19631027T020000
-RDATE:19641025T020000
-RDATE:19651024T020000
-RDATE:19661023T020000
-RDATE:19671029T020000
+DTSTART:19080101T000000
+RDATE:19080101T000000
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19680407T010000
-RDATE:19680407T010000
+TZOFFSETFROM:-0127
+TZOFFSETTO:-0128
+TZNAME:RMT
+DTSTART:18370101T000000
+RDATE:18370101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Atlantic/St_Helena.ics b/libical/zoneinfo/Atlantic/St_Helena.ics
index f0755f9b7e..ad3f30f81a 100644
--- a/libical/zoneinfo/Atlantic/St_Helena.ics
+++ b/libical/zoneinfo/Atlantic/St_Helena.ics
@@ -2,21 +2,21 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/St_Helena
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/St_Helena
 X-LIC-LOCATION:Atlantic/St_Helena
 BEGIN:STANDARD
 TZOFFSETFROM:-0023
-TZOFFSETTO:-0023
-TZNAME:JMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0023
 TZOFFSETTO:+0000
 TZNAME:GMT
 DTSTART:19510101T000000
 RDATE:19510101T000000
 END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0023
+TZOFFSETTO:-0023
+TZNAME:JMT
+DTSTART:18900101T000000
+RDATE:18900101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/libical/zoneinfo/Atlantic/Stanley.ics b/libical/zoneinfo/Atlantic/Stanley.ics
index b2e3610fbf..a7147ec039 100644
--- a/libical/zoneinfo/Atlantic/Stanley.ics
+++ b/libical/zoneinfo/Atlantic/Stanley.ics
@@ -2,7 +2,7 @@ BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010831_3/Atlantic/Stanley
+TZID:/softwarestudio.org/Olson_20011022_4/Atlantic/Stanley
 X-LIC-LOCATION:Atlantic/Stanley
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
@@ -18,103 +18,103 @@ TZNAME:FKST
 DTSTART:20010902T020000
 RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SU
 END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0351
-TZOFFSETTO:-0351
-TZNAME:SMT
-DTSTART:18900101T000000
-RDATE:18900101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0351
-TZOFFSETTO:-0400
-TZNAME:FKT
-DTSTART:19120312T000000
-RDATE:19120312T000000
-END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0300
 TZNAME:FKST
-DTSTART:19370926T000000
-RDATE:19370926T000000
-RDATE:19380925T000000
-RDATE:19391001T000000
-RDATE:19400929T000000
-RDATE:19410928T000000
-RDATE:19420927T000000
-RDATE:19860914T000000
-RDATE:19870913T000000
-RDATE:19880911T000000
-RDATE:19890910T000000
-RDATE:19900909T000000
-RDATE:19910915T000000
-RDATE:19920913T000000
-RDATE:19930912T000000
-RDATE:19940911T000000
-RDATE:19950910T000000
-RDATE:19960915T000000
-RDATE:19970914T000000
-RDATE:19980913T000000
-RDATE:19990912T000000
+DTSTART:20000910T000000
 RDATE:20000910T000000
+RDATE:19990912T000000
+RDATE:19980913T000000
+RDATE:19970914T000000
+RDATE:19960915T000000
+RDATE:19950910T000000
+RDATE:19940911T000000
+RDATE:19930912T000000
+RDATE:19920913T000000
+RDATE:19910915T000000
+RDATE:19900909T000000
+RDATE:19890910T000000
+RDATE:19880911T000000
+RDATE:19870913T000000
+RDATE:19860914T000000
+RDATE:19420927T000000
+RDATE:19410928T000000
+RDATE:19400929T000000
+RDATE:19391001T000000
+RDATE:19380925T000000
+RDATE:19370926T000000
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0300
 TZOFFSETTO:-0400
 TZNAME:FKT
-DTSTART:19380320T000000
-RDATE:19380320T000000
-RDATE:19390319T000000
-RDATE:19400324T000000
-RDATE:19410323T000000
-RDATE:19420322T000000
-RDATE:19430101T000000
-RDATE:19860420T000000
-RDATE:19870419T000000
-RDATE:19880417T000000
-RDATE:19890416T000000
-RDATE:19900422T000000
-RDATE:19910421T000000
-RDATE:19920419T000000
-RDATE:19930418T000000
-RDATE:19940417T000000
-RDATE:19950416T000000
-RDATE:19960421T000000
-RDATE:19970420T000000
-RDATE:19980419T000000
-RDATE:19990418T000000
+DTSTART:20000416T000000
 RDATE:20000416T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0300
-TZNAME:FKT
-DTSTART:19830501T000000
-RDATE:19830501T000000
+RDATE:19990418T000000
+RDATE:19980419T000000
+RDATE:19970420T000000
+RDATE:19960421T000000
+RDATE:19950416T000000
+RDATE:19940417T000000
+RDATE:19930418T000000
+RDATE:19920419T000000
+RDATE:19910421T000000
+RDATE:19900422T000000
+RDATE:19890416T000000
+RDATE:19880417T000000
+RDATE:19870419T000000
+RDATE:19860420T000000
+RDATE:19430101T000000
+RDATE:19420322T000000
+RDATE:19410323T000000
+RDATE:19400324T000000
+RDATE:19390319T000000
+RDATE:19380320T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0200
+TZOFFSETTO:-0300
 TZNAME:FKST
-DTSTART:19830925T000000
-RDATE:19830925T000000
-RDATE:19840916T000000
+DTSTART:19850915T000000
+RDATE:19850915T000000
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
 TZNAME:FKT
-DTSTART:19840429T000000
-RDATE:19840429T000000
+DTSTART:19850428T000000
 RDATE:19850428T000000
+RDATE:19840429T000000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:-0300
-TZOFFSETTO:-0300
+TZOFFSETTO:-0200
 TZNAME:FKST
-DTSTART:19850915T000000
-RDATE:19850915T000000
+DTSTART:19840916T000000
+RDATE:19840916T000000
+RDATE:19830925T000000
 END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0300
+TZNAME:FKT
+DTSTART:19830501T000000
+RDATE:19830501T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0351
+TZOFFSETTO:-0400
+TZNAME:FKT
+DTSTART:19120312T000000
+RDATE:19120312T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0351
+TZOFFSETTO:-0351
+TZNAME:SMT
+DTSTART:18900101T000000
+RDATE:18900101T000000
+END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR