--- org/northamerica	2016-01-26 04:04:14.000000000 +1000
+++ northamerica	2016-03-06 10:35:00.588137294 +1000
@@ -145,14 +145,14 @@
 # increase the chances that they'll actually get compiled and to
 # avoid the need to duplicate the US rules in another file.
 
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	EST		 -5:00	-	EST
-Zone	MST		 -7:00	-	MST
-Zone	HST		-10:00	-	HST
-Zone	EST5EDT		 -5:00	US	E%sT
-Zone	CST6CDT		 -6:00	US	C%sT
-Zone	MST7MDT		 -7:00	US	M%sT
-Zone	PST8PDT		 -8:00	US	P%sT
+# Zone	NAME	GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	EST	 -5:00	-	EST
+Zone	MST	 -7:00	-	MST
+Zone	HST	-10:00	-	HST
+Zone	EST5EDT	 -5:00	US	E%sT
+Zone	CST6CDT	 -6:00	US	C%sT
+Zone	MST7MDT	 -7:00	US	M%sT
+Zone	PST8PDT	 -8:00	US	P%sT
 
 # From Bob Devine (1988-01-28):
 # ...Alaska (and Hawaii) had the timezone names changed in 1967.
@@ -352,7 +352,7 @@
 			-6:00	Chicago	C%sT	1967
 			-6:00	US	C%sT
 # Oliver County, ND switched from mountain to central time on 1992-10-25.
-Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
+Zone America/North_Dakota/Center -6:45:12 -	LMT	1883 Nov 18 12:14:48
 			-7:00	US	M%sT	1992 Oct 25  2:00
 			-6:00	US	C%sT
 # Morton County, ND, switched from mountain to central time on
@@ -362,7 +362,7 @@
 # Jones, Mellette, and Todd Counties in South Dakota;
 # but in practice these other counties were already observing central time.
 # See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
-Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
+Zone America/North_Dakota/New_Salem -6:45:39 -	LMT	1883 Nov 18 12:14:21
 			-7:00	US	M%sT	2003 Oct 26  2:00
 			-6:00	US	C%sT
 
@@ -380,7 +380,7 @@
 # at 47 degrees 15' 51" N, 101 degrees 46' 40" W, which yields an offset
 # of 6h47'07".
 
-Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
+Zone America/North_Dakota/Beulah -6:47:07 -	LMT	1883 Nov 18 12:12:53
 			-7:00	US	M%sT	2010 Nov  7  2:00
 			-6:00	US	C%sT
 
@@ -729,11 +729,11 @@
 # http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/702070524/0/LOCAL
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Indianapolis 1941	only	-	Jun	22	2:00	1:00	D
-Rule Indianapolis 1941	1954	-	Sep	lastSun	2:00	0	S
-Rule Indianapolis 1946	1954	-	Apr	lastSun	2:00	1:00	D
+Rule	Indianapolis	1941	only	-	Jun	22	2:00	1:00	D
+Rule	Indianapolis	1941	1954	-	Sep	lastSun	2:00	0	S
+Rule	Indianapolis	1946	1954	-	Apr	lastSun	2:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Indianapolis -5:44:38 - LMT	1883 Nov 18 12:15:22
+Zone America/Indiana/Indianapolis -5:44:38 -	LMT	1883 Nov 18 12:15:22
 			-6:00	US	C%sT	1920
 			-6:00 Indianapolis C%sT	1942
 			-6:00	US	C%sT	1946
@@ -767,15 +767,15 @@
 # switched from eastern to central time in April 2006, then switched back
 # in November 2007.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Vincennes	1946	only	-	Apr	lastSun	2:00	1:00	D
-Rule Vincennes	1946	only	-	Sep	lastSun	2:00	0	S
-Rule Vincennes	1953	1954	-	Apr	lastSun	2:00	1:00	D
-Rule Vincennes	1953	1959	-	Sep	lastSun	2:00	0	S
-Rule Vincennes	1955	only	-	May	 1	0:00	1:00	D
-Rule Vincennes	1956	1963	-	Apr	lastSun	2:00	1:00	D
-Rule Vincennes	1960	only	-	Oct	lastSun	2:00	0	S
-Rule Vincennes	1961	only	-	Sep	lastSun	2:00	0	S
-Rule Vincennes	1962	1963	-	Oct	lastSun	2:00	0	S
+Rule	Vincennes	1946	only	-	Apr	lastSun	2:00	1:00	D
+Rule	Vincennes	1946	only	-	Sep	lastSun	2:00	0	S
+Rule	Vincennes	1953	1954	-	Apr	lastSun	2:00	1:00	D
+Rule	Vincennes	1953	1959	-	Sep	lastSun	2:00	0	S
+Rule	Vincennes	1955	only	-	May	 1	0:00	1:00	D
+Rule	Vincennes	1956	1963	-	Apr	lastSun	2:00	1:00	D
+Rule	Vincennes	1960	only	-	Oct	lastSun	2:00	0	S
+Rule	Vincennes	1961	only	-	Sep	lastSun	2:00	0	S
+Rule	Vincennes	1962	1963	-	Oct	lastSun	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
 			-6:00	US	C%sT	1946
@@ -788,15 +788,15 @@
 #
 # Perry County, Indiana, switched from eastern to central time in April 2006.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Perry	1946	only	-	Apr	lastSun	2:00	1:00	D
-Rule Perry	1946	only	-	Sep	lastSun	2:00	0	S
-Rule Perry	1953	1954	-	Apr	lastSun	2:00	1:00	D
-Rule Perry	1953	1959	-	Sep	lastSun	2:00	0	S
-Rule Perry	1955	only	-	May	 1	0:00	1:00	D
-Rule Perry	1956	1963	-	Apr	lastSun	2:00	1:00	D
-Rule Perry	1960	only	-	Oct	lastSun	2:00	0	S
-Rule Perry	1961	only	-	Sep	lastSun	2:00	0	S
-Rule Perry	1962	1963	-	Oct	lastSun	2:00	0	S
+Rule	Perry	1946	only	-	Apr	lastSun	2:00	1:00	D
+Rule	Perry	1946	only	-	Sep	lastSun	2:00	0	S
+Rule	Perry	1953	1954	-	Apr	lastSun	2:00	1:00	D
+Rule	Perry	1953	1959	-	Sep	lastSun	2:00	0	S
+Rule	Perry	1955	only	-	May	 1	0:00	1:00	D
+Rule	Perry	1956	1963	-	Apr	lastSun	2:00	1:00	D
+Rule	Perry	1960	only	-	Oct	lastSun	2:00	0	S
+Rule	Perry	1961	only	-	Sep	lastSun	2:00	0	S
+Rule	Perry	1962	1963	-	Oct	lastSun	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Indiana/Tell_City -5:47:03 - LMT	1883 Nov 18 12:12:57
 			-6:00	US	C%sT	1946
@@ -873,13 +873,13 @@
 # Part of Kentucky left its clocks alone in 1974.
 # This also includes Clark, Floyd, and Harrison counties in Indiana.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Louisville	1921	only	-	May	1	2:00	1:00	D
-Rule Louisville	1921	only	-	Sep	1	2:00	0	S
-Rule Louisville	1941	1961	-	Apr	lastSun	2:00	1:00	D
-Rule Louisville	1941	only	-	Sep	lastSun	2:00	0	S
-Rule Louisville	1946	only	-	Jun	2	2:00	0	S
-Rule Louisville	1950	1955	-	Sep	lastSun	2:00	0	S
-Rule Louisville	1956	1960	-	Oct	lastSun	2:00	0	S
+Rule	Louisville	1921	only	-	May	1	2:00	1:00	D
+Rule	Louisville	1921	only	-	Sep	1	2:00	0	S
+Rule	Louisville	1941	1961	-	Apr	lastSun	2:00	1:00	D
+Rule	Louisville	1941	only	-	Sep	lastSun	2:00	0	S
+Rule	Louisville	1946	only	-	Jun	2	2:00	0	S
+Rule	Louisville	1950	1955	-	Sep	lastSun	2:00	0	S
+Rule	Louisville	1956	1960	-	Oct	lastSun	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Kentucky/Louisville -5:43:02 -	LMT	1883 Nov 18 12:16:58
 			-6:00	US	C%sT	1921
@@ -988,10 +988,10 @@
 # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
 # switched from EST to CST/CDT in 1973.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Menominee	1946	only	-	Apr	lastSun	2:00	1:00	D
-Rule Menominee	1946	only	-	Sep	lastSun	2:00	0	S
-Rule Menominee	1966	only	-	Apr	lastSun	2:00	1:00	D
-Rule Menominee	1966	only	-	Oct	lastSun	2:00	0	S
+Rule	Menominee	1946	only	-	Apr	lastSun	2:00	1:00	D
+Rule	Menominee	1946	only	-	Sep	lastSun	2:00	0	S
+Rule	Menominee	1966	only	-	Apr	lastSun	2:00	1:00	D
+Rule	Menominee	1966	only	-	Oct	lastSun	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 			-6:00	US	C%sT	1946
@@ -3141,7 +3141,7 @@
 
 # Martinique
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Martinique	-4:04:20 -      LMT	1890        # Fort-de-France
+Zone America/Martinique	-4:04:20 -	LMT	1890        # Fort-de-France
 			-4:04:20 -	FFMT	1911 May    # Fort-de-France MT
 			-4:00	-	AST	1980 Apr  6
 			-4:00	1:00	ADT	1980 Sep 28