merge trunk

1 files changed, 90 insertions, 90 deletions

diff --git a/library/tzdata/Antarctica/Macquarie b/library/tzdata/Antarctica/Macquarie
index bd5cf8a..07ddff6 100644
--- a/library/tzdata/Antarctica/Macquarie
+++ b/library/tzdata/Antarctica/Macquarie
@@ -2,96 +2,96 @@
 
 set TZData(:Antarctica/Macquarie) {
     {-9223372036854775808 0 0 zzz}
-    {-2214259200 36000 0 EST}
-    {-1680508800 39600 1 EST}
-    {-1669892400 39600 0 EST}
-    {-1665392400 36000 0 EST}
+    {-2214259200 36000 0 AEST}
+    {-1680508800 39600 1 AEDT}
+    {-1669892400 39600 0 AEDT}
+    {-1665392400 36000 0 AEST}
     {-1601719200 0 0 zzz}
-    {-94730400 36000 0 EST}
-    {-71136000 39600 1 EST}
-    {-55411200 36000 0 EST}
-    {-37267200 39600 1 EST}
-    {-25776000 36000 0 EST}
-    {-5817600 39600 1 EST}
-    {5673600 36000 0 EST}
-    {25632000 39600 1 EST}
-    {37728000 36000 0 EST}
-    {57686400 39600 1 EST}
-    {67968000 36000 0 EST}
-    {89136000 39600 1 EST}
-    {100022400 36000 0 EST}
-    {120585600 39600 1 EST}
-    {131472000 36000 0 EST}
-    {152035200 39600 1 EST}
-    {162921600 36000 0 EST}
-    {183484800 39600 1 EST}
-    {194976000 36000 0 EST}
-    {215539200 39600 1 EST}
-    {226425600 36000 0 EST}
-    {246988800 39600 1 EST}
-    {257875200 36000 0 EST}
-    {278438400 39600 1 EST}
-    {289324800 36000 0 EST}
-    {309888000 39600 1 EST}
-    {320774400 36000 0 EST}
-    {341337600 39600 1 EST}
-    {352224000 36000 0 EST}
-    {372787200 39600 1 EST}
-    {386092800 36000 0 EST}
-    {404841600 39600 1 EST}
-    {417542400 36000 0 EST}
-    {436291200 39600 1 EST}
-    {447177600 36000 0 EST}
-    {467740800 39600 1 EST}
-    {478627200 36000 0 EST}
-    {499190400 39600 1 EST}
-    {510076800 36000 0 EST}
-    {530035200 39600 1 EST}
-    {542736000 36000 0 EST}
-    {562089600 39600 1 EST}
-    {574790400 36000 0 EST}
-    {594144000 39600 1 EST}
-    {606240000 36000 0 EST}
-    {625593600 39600 1 EST}
-    {637689600 36000 0 EST}
-    {657043200 39600 1 EST}
-    {670348800 36000 0 EST}
-    {686678400 39600 1 EST}
-    {701798400 36000 0 EST}
-    {718128000 39600 1 EST}
-    {733248000 36000 0 EST}
-    {749577600 39600 1 EST}
-    {764697600 36000 0 EST}
-    {781027200 39600 1 EST}
-    {796147200 36000 0 EST}
-    {812476800 39600 1 EST}
-    {828201600 36000 0 EST}
-    {844531200 39600 1 EST}
-    {859651200 36000 0 EST}
-    {875980800 39600 1 EST}
-    {891100800 36000 0 EST}
-    {907430400 39600 1 EST}
-    {922550400 36000 0 EST}
-    {938880000 39600 1 EST}
-    {954000000 36000 0 EST}
-    {967305600 39600 1 EST}
-    {985449600 36000 0 EST}
-    {1002384000 39600 1 EST}
-    {1017504000 36000 0 EST}
-    {1033833600 39600 1 EST}
-    {1048953600 36000 0 EST}
-    {1065283200 39600 1 EST}
-    {1080403200 36000 0 EST}
-    {1096732800 39600 1 EST}
-    {1111852800 36000 0 EST}
-    {1128182400 39600 1 EST}
-    {1143907200 36000 0 EST}
-    {1159632000 39600 1 EST}
-    {1174752000 36000 0 EST}
-    {1191686400 39600 1 EST}
-    {1207411200 36000 0 EST}
-    {1223136000 39600 1 EST}
-    {1238860800 36000 0 EST}
-    {1254585600 39600 1 EST}
+    {-94730400 36000 0 AEST}
+    {-71136000 39600 1 AEDT}
+    {-55411200 36000 0 AEST}
+    {-37267200 39600 1 AEDT}
+    {-25776000 36000 0 AEST}
+    {-5817600 39600 1 AEDT}
+    {5673600 36000 0 AEST}
+    {25632000 39600 1 AEDT}
+    {37728000 36000 0 AEST}
+    {57686400 39600 1 AEDT}
+    {67968000 36000 0 AEST}
+    {89136000 39600 1 AEDT}
+    {100022400 36000 0 AEST}
+    {120585600 39600 1 AEDT}
+    {131472000 36000 0 AEST}
+    {152035200 39600 1 AEDT}
+    {162921600 36000 0 AEST}
+    {183484800 39600 1 AEDT}
+    {194976000 36000 0 AEST}
+    {215539200 39600 1 AEDT}
+    {226425600 36000 0 AEST}
+    {246988800 39600 1 AEDT}
+    {257875200 36000 0 AEST}
+    {278438400 39600 1 AEDT}
+    {289324800 36000 0 AEST}
+    {309888000 39600 1 AEDT}
+    {320774400 36000 0 AEST}
+    {341337600 39600 1 AEDT}
+    {352224000 36000 0 AEST}
+    {372787200 39600 1 AEDT}
+    {386092800 36000 0 AEST}
+    {404841600 39600 1 AEDT}
+    {417542400 36000 0 AEST}
+    {436291200 39600 1 AEDT}
+    {447177600 36000 0 AEST}
+    {467740800 39600 1 AEDT}
+    {478627200 36000 0 AEST}
+    {499190400 39600 1 AEDT}
+    {510076800 36000 0 AEST}
+    {530035200 39600 1 AEDT}
+    {542736000 36000 0 AEST}
+    {562089600 39600 1 AEDT}
+    {574790400 36000 0 AEST}
+    {594144000 39600 1 AEDT}
+    {606240000 36000 0 AEST}
+    {625593600 39600 1 AEDT}
+    {637689600 36000 0 AEST}
+    {657043200 39600 1 AEDT}
+    {670348800 36000 0 AEST}
+    {686678400 39600 1 AEDT}
+    {701798400 36000 0 AEST}
+    {718128000 39600 1 AEDT}
+    {733248000 36000 0 AEST}
+    {749577600 39600 1 AEDT}
+    {764697600 36000 0 AEST}
+    {781027200 39600 1 AEDT}
+    {796147200 36000 0 AEST}
+    {812476800 39600 1 AEDT}
+    {828201600 36000 0 AEST}
+    {844531200 39600 1 AEDT}
+    {859651200 36000 0 AEST}
+    {875980800 39600 1 AEDT}
+    {891100800 36000 0 AEST}
+    {907430400 39600 1 AEDT}
+    {922550400 36000 0 AEST}
+    {938880000 39600 1 AEDT}
+    {954000000 36000 0 AEST}
+    {967305600 39600 1 AEDT}
+    {985449600 36000 0 AEST}
+    {1002384000 39600 1 AEDT}
+    {1017504000 36000 0 AEST}
+    {1033833600 39600 1 AEDT}
+    {1048953600 36000 0 AEST}
+    {1065283200 39600 1 AEDT}
+    {1080403200 36000 0 AEST}
+    {1096732800 39600 1 AEDT}
+    {1111852800 36000 0 AEST}
+    {1128182400 39600 1 AEDT}
+    {1143907200 36000 0 AEST}
+    {1159632000 39600 1 AEDT}
+    {1174752000 36000 0 AEST}
+    {1191686400 39600 1 AEDT}
+    {1207411200 36000 0 AEST}
+    {1223136000 39600 1 AEDT}
+    {1238860800 36000 0 AEST}
+    {1254585600 39600 1 AEDT}
     {1270310400 39600 0 MIST}
 }