Merge timzeone data changes from vendor branch. Most significant change

is 1996 EC harmonization.  Also, the following timezones have been renamed:
	Asia/Frunze -> Asia/Bishkek
	Pacific/Cocos -> Indian/Cocos
	Pacific/Belau -> Pacific/Palau
	America/Navajo -> America/Shiprock
and one new timezone has been added:
	Australia/Canberra

1 files changed, 38 insertions, 14 deletions

diff --git a/share/zoneinfo/northamerica b/share/zoneinfo/northamerica
index 7eeedb5..62de7eb 100644
--- a/share/zoneinfo/northamerica
+++ b/share/zoneinfo/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	7.11
+# @(#)northamerica	7.15
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
@@ -151,7 +151,7 @@ Zone America/Phoenix	-7:00	US	M%sT	1946
 # ZONE-DESCR America Fort_Wayne United_States Indiana (except Starke County)
 # ZONE-DESCR America Knox_IN United_States Indiana (Starke County)
 # ZONE-DESCR America Phoenix United_States Arizona (except Navajo Nation)
-# ZONE-DESCR America Navajo United_States Arizona (Navajo Nation)
+# ZONE-DESCR America Shiprock United_States Arizona (Navajo Nation)
 
 # From Arthur David Olson (February 13, 1988):
 # However. . .a writer from the Inter Tribal Council of Arizona, Inc.,
@@ -160,7 +160,7 @@ Zone America/Phoenix	-7:00	US	M%sT	1946
 # large size and location in three states."  (The "only" means that other
 # tribal nations don't use DST.)
 
-Link America/Denver America/Navajo
+Link	America/Denver	America/Shiprock
 
 # From Bob Devine (January 28, 1988):
 # Michigan didn't observe DST from 1968 to 1973.
@@ -219,17 +219,6 @@ Link Pacific/Pago_Pago Pacific/Apia
 # no information; probably like US/Eastern
 
 
-# Old names, for S5 users
-
-# Link	LINK-FROM		LINK-TO
-Link	America/New_York	EST5EDT
-Link	America/Chicago		CST6CDT
-Link	America/Denver		MST7MDT
-Link	America/Los_Angeles	PST8PDT
-Link	America/Fort_Wayne	EST
-Link	America/Phoenix		MST
-Link	Pacific/Honolulu	HST
-
 ################################################################################
 
 
@@ -246,6 +235,8 @@ Link	Pacific/Honolulu	HST
 # I invented the abbreviation SPST for St Pierre Standard Time; SPDT likewise.
 # Corrections are welcome!
 #
+# See the `europe' file for Greenland.
+#
 # See the `africa' file for Zone naming conventions.
 
 
@@ -324,6 +315,39 @@ Link	Pacific/Honolulu	HST
 # East-Saskatchewan kept to avoid problems for folks using that zone by name;
 # plain Saskatchewan added.
 
+# From Alain LaBont<e'> <ALB@immedia.ca> (1994-11-14):
+# I post here the time zone abbreviations standardized in Canada
+# for both English and French in the CAN/CSA-Z234.4-89 standard....
+#
+#	UTC	Standard time	Daylight savings time
+#	offset	French	English	French	English
+#	-2:30	-	-	HAT	NDT
+#	-3	-	-	HAA	ADT
+#	-3:30	HNT	NST	-	-
+#	-4	HNA	AST	HAE	EDT
+#	-5	HNE	EST	HAC	CDT
+#	-6	HNC	CST	HAR	MDT
+#	-7	HNR	MST	HAP	PDT
+#	-8	HNP	PST	HAY	YDT
+#	-9	HNY	YST	-	-
+#
+#	HN: Heure Normale	ST: Standard Time
+#	HA: Heure Avanc<e'>e	DT: Daylight saving Time
+#
+#	A: de l'Atlantique	Atlantic
+#	C: du Centre		Central
+#	E: de l'Est		Eastern
+#	M:			Mountain
+#	N:			Newfoundland
+#	P: du Pacifique		Pacific
+#	R: des Rocheuses
+#	T: de Terre-Neuve
+#	Y: du Yukon		Yukon
+#
+# From Paul Eggert <eggert@twinsun.com> (1994-11-22):
+# Alas, this sort of thing must be handled by localization software.
+
+
 
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S