merge trunk

1 files changed, 267 insertions, 267 deletions

diff --git a/library/tzdata/Australia/Melbourne b/library/tzdata/Australia/Melbourne
index 907b8b9..81777df 100644
--- a/library/tzdata/Australia/Melbourne
+++ b/library/tzdata/Australia/Melbourne
@@ -2,271 +2,271 @@
 
 set TZData(:Australia/Melbourne) {
     {-9223372036854775808 34792 0 LMT}
-    {-2364111592 36000 0 EST}
-    {-1672567140 39600 1 EST}
-    {-1665392400 36000 0 EST}
-    {-883641600 39600 1 EST}
-    {-876128400 36000 0 EST}
-    {-860400000 39600 1 EST}
-    {-844678800 36000 0 EST}
-    {-828345600 39600 1 EST}
-    {-813229200 36000 0 EST}
-    {31500000 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}
-    {384278400 36000 0 EST}
-    {404841600 39600 1 EST}
-    {415728000 36000 0 EST}
-    {436291200 39600 1 EST}
-    {447177600 36000 0 EST}
-    {467740800 39600 1 EST}
-    {478627200 36000 0 EST}
-    {499190400 39600 1 EST}
-    {511286400 36000 0 EST}
-    {530035200 39600 1 EST}
-    {542736000 36000 0 EST}
-    {561484800 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}
-    {667929600 36000 0 EST}
-    {688492800 39600 1 EST}
-    {699379200 36000 0 EST}
-    {719942400 39600 1 EST}
-    {731433600 36000 0 EST}
-    {751996800 39600 1 EST}
-    {762883200 36000 0 EST}
-    {783446400 39600 1 EST}
-    {796147200 36000 0 EST}
-    {814896000 39600 1 EST}
-    {828201600 36000 0 EST}
-    {846345600 39600 1 EST}
-    {859651200 36000 0 EST}
-    {877795200 39600 1 EST}
-    {891100800 36000 0 EST}
-    {909244800 39600 1 EST}
-    {922550400 36000 0 EST}
-    {941299200 39600 1 EST}
-    {954000000 36000 0 EST}
-    {967305600 39600 1 EST}
-    {985449600 36000 0 EST}
-    {1004198400 39600 1 EST}
-    {1017504000 36000 0 EST}
-    {1035648000 39600 1 EST}
-    {1048953600 36000 0 EST}
-    {1067097600 39600 1 EST}
-    {1080403200 36000 0 EST}
-    {1099152000 39600 1 EST}
-    {1111852800 36000 0 EST}
-    {1130601600 39600 1 EST}
-    {1143907200 36000 0 EST}
-    {1162051200 39600 1 EST}
-    {1174752000 36000 0 EST}
-    {1193500800 39600 1 EST}
-    {1207411200 36000 0 EST}
-    {1223136000 39600 1 EST}
-    {1238860800 36000 0 EST}
-    {1254585600 39600 1 EST}
-    {1270310400 36000 0 EST}
-    {1286035200 39600 1 EST}
-    {1301760000 36000 0 EST}
-    {1317484800 39600 1 EST}
-    {1333209600 36000 0 EST}
-    {1349539200 39600 1 EST}
-    {1365264000 36000 0 EST}
-    {1380988800 39600 1 EST}
-    {1396713600 36000 0 EST}
-    {1412438400 39600 1 EST}
-    {1428163200 36000 0 EST}
-    {1443888000 39600 1 EST}
-    {1459612800 36000 0 EST}
-    {1475337600 39600 1 EST}
-    {1491062400 36000 0 EST}
-    {1506787200 39600 1 EST}
-    {1522512000 36000 0 EST}
-    {1538841600 39600 1 EST}
-    {1554566400 36000 0 EST}
-    {1570291200 39600 1 EST}
-    {1586016000 36000 0 EST}
-    {1601740800 39600 1 EST}
-    {1617465600 36000 0 EST}
-    {1633190400 39600 1 EST}
-    {1648915200 36000 0 EST}
-    {1664640000 39600 1 EST}
-    {1680364800 36000 0 EST}
-    {1696089600 39600 1 EST}
-    {1712419200 36000 0 EST}
-    {1728144000 39600 1 EST}
-    {1743868800 36000 0 EST}
-    {1759593600 39600 1 EST}
-    {1775318400 36000 0 EST}
-    {1791043200 39600 1 EST}
-    {1806768000 36000 0 EST}
-    {1822492800 39600 1 EST}
-    {1838217600 36000 0 EST}
-    {1853942400 39600 1 EST}
-    {1869667200 36000 0 EST}
-    {1885996800 39600 1 EST}
-    {1901721600 36000 0 EST}
-    {1917446400 39600 1 EST}
-    {1933171200 36000 0 EST}
-    {1948896000 39600 1 EST}
-    {1964620800 36000 0 EST}
-    {1980345600 39600 1 EST}
-    {1996070400 36000 0 EST}
-    {2011795200 39600 1 EST}
-    {2027520000 36000 0 EST}
-    {2043244800 39600 1 EST}
-    {2058969600 36000 0 EST}
-    {2075299200 39600 1 EST}
-    {2091024000 36000 0 EST}
-    {2106748800 39600 1 EST}
-    {2122473600 36000 0 EST}
-    {2138198400 39600 1 EST}
-    {2153923200 36000 0 EST}
-    {2169648000 39600 1 EST}
-    {2185372800 36000 0 EST}
-    {2201097600 39600 1 EST}
-    {2216822400 36000 0 EST}
-    {2233152000 39600 1 EST}
-    {2248876800 36000 0 EST}
-    {2264601600 39600 1 EST}
-    {2280326400 36000 0 EST}
-    {2296051200 39600 1 EST}
-    {2311776000 36000 0 EST}
-    {2327500800 39600 1 EST}
-    {2343225600 36000 0 EST}
-    {2358950400 39600 1 EST}
-    {2374675200 36000 0 EST}
-    {2390400000 39600 1 EST}
-    {2406124800 36000 0 EST}
-    {2422454400 39600 1 EST}
-    {2438179200 36000 0 EST}
-    {2453904000 39600 1 EST}
-    {2469628800 36000 0 EST}
-    {2485353600 39600 1 EST}
-    {2501078400 36000 0 EST}
-    {2516803200 39600 1 EST}
-    {2532528000 36000 0 EST}
-    {2548252800 39600 1 EST}
-    {2563977600 36000 0 EST}
-    {2579702400 39600 1 EST}
-    {2596032000 36000 0 EST}
-    {2611756800 39600 1 EST}
-    {2627481600 36000 0 EST}
-    {2643206400 39600 1 EST}
-    {2658931200 36000 0 EST}
-    {2674656000 39600 1 EST}
-    {2690380800 36000 0 EST}
-    {2706105600 39600 1 EST}
-    {2721830400 36000 0 EST}
-    {2737555200 39600 1 EST}
-    {2753280000 36000 0 EST}
-    {2769609600 39600 1 EST}
-    {2785334400 36000 0 EST}
-    {2801059200 39600 1 EST}
-    {2816784000 36000 0 EST}
-    {2832508800 39600 1 EST}
-    {2848233600 36000 0 EST}
-    {2863958400 39600 1 EST}
-    {2879683200 36000 0 EST}
-    {2895408000 39600 1 EST}
-    {2911132800 36000 0 EST}
-    {2926857600 39600 1 EST}
-    {2942582400 36000 0 EST}
-    {2958912000 39600 1 EST}
-    {2974636800 36000 0 EST}
-    {2990361600 39600 1 EST}
-    {3006086400 36000 0 EST}
-    {3021811200 39600 1 EST}
-    {3037536000 36000 0 EST}
-    {3053260800 39600 1 EST}
-    {3068985600 36000 0 EST}
-    {3084710400 39600 1 EST}
-    {3100435200 36000 0 EST}
-    {3116764800 39600 1 EST}
-    {3132489600 36000 0 EST}
-    {3148214400 39600 1 EST}
-    {3163939200 36000 0 EST}
-    {3179664000 39600 1 EST}
-    {3195388800 36000 0 EST}
-    {3211113600 39600 1 EST}
-    {3226838400 36000 0 EST}
-    {3242563200 39600 1 EST}
-    {3258288000 36000 0 EST}
-    {3274012800 39600 1 EST}
-    {3289737600 36000 0 EST}
-    {3306067200 39600 1 EST}
-    {3321792000 36000 0 EST}
-    {3337516800 39600 1 EST}
-    {3353241600 36000 0 EST}
-    {3368966400 39600 1 EST}
-    {3384691200 36000 0 EST}
-    {3400416000 39600 1 EST}
-    {3416140800 36000 0 EST}
-    {3431865600 39600 1 EST}
-    {3447590400 36000 0 EST}
-    {3463315200 39600 1 EST}
-    {3479644800 36000 0 EST}
-    {3495369600 39600 1 EST}
-    {3511094400 36000 0 EST}
-    {3526819200 39600 1 EST}
-    {3542544000 36000 0 EST}
-    {3558268800 39600 1 EST}
-    {3573993600 36000 0 EST}
-    {3589718400 39600 1 EST}
-    {3605443200 36000 0 EST}
-    {3621168000 39600 1 EST}
-    {3636892800 36000 0 EST}
-    {3653222400 39600 1 EST}
-    {3668947200 36000 0 EST}
-    {3684672000 39600 1 EST}
-    {3700396800 36000 0 EST}
-    {3716121600 39600 1 EST}
-    {3731846400 36000 0 EST}
-    {3747571200 39600 1 EST}
-    {3763296000 36000 0 EST}
-    {3779020800 39600 1 EST}
-    {3794745600 36000 0 EST}
-    {3810470400 39600 1 EST}
-    {3826195200 36000 0 EST}
-    {3842524800 39600 1 EST}
-    {3858249600 36000 0 EST}
-    {3873974400 39600 1 EST}
-    {3889699200 36000 0 EST}
-    {3905424000 39600 1 EST}
-    {3921148800 36000 0 EST}
-    {3936873600 39600 1 EST}
-    {3952598400 36000 0 EST}
-    {3968323200 39600 1 EST}
-    {3984048000 36000 0 EST}
-    {4000377600 39600 1 EST}
-    {4016102400 36000 0 EST}
-    {4031827200 39600 1 EST}
-    {4047552000 36000 0 EST}
-    {4063276800 39600 1 EST}
-    {4079001600 36000 0 EST}
-    {4094726400 39600 1 EST}
+    {-2364111592 36000 0 AEST}
+    {-1672567140 39600 1 AEDT}
+    {-1665392400 36000 0 AEST}
+    {-883641600 39600 1 AEDT}
+    {-876128400 36000 0 AEST}
+    {-860400000 39600 1 AEDT}
+    {-844678800 36000 0 AEST}
+    {-828345600 39600 1 AEDT}
+    {-813229200 36000 0 AEST}
+    {31500000 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}
+    {384278400 36000 0 AEST}
+    {404841600 39600 1 AEDT}
+    {415728000 36000 0 AEST}
+    {436291200 39600 1 AEDT}
+    {447177600 36000 0 AEST}
+    {467740800 39600 1 AEDT}
+    {478627200 36000 0 AEST}
+    {499190400 39600 1 AEDT}
+    {511286400 36000 0 AEST}
+    {530035200 39600 1 AEDT}
+    {542736000 36000 0 AEST}
+    {561484800 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}
+    {667929600 36000 0 AEST}
+    {688492800 39600 1 AEDT}
+    {699379200 36000 0 AEST}
+    {719942400 39600 1 AEDT}
+    {731433600 36000 0 AEST}
+    {751996800 39600 1 AEDT}
+    {762883200 36000 0 AEST}
+    {783446400 39600 1 AEDT}
+    {796147200 36000 0 AEST}
+    {814896000 39600 1 AEDT}
+    {828201600 36000 0 AEST}
+    {846345600 39600 1 AEDT}
+    {859651200 36000 0 AEST}
+    {877795200 39600 1 AEDT}
+    {891100800 36000 0 AEST}
+    {909244800 39600 1 AEDT}
+    {922550400 36000 0 AEST}
+    {941299200 39600 1 AEDT}
+    {954000000 36000 0 AEST}
+    {967305600 39600 1 AEDT}
+    {985449600 36000 0 AEST}
+    {1004198400 39600 1 AEDT}
+    {1017504000 36000 0 AEST}
+    {1035648000 39600 1 AEDT}
+    {1048953600 36000 0 AEST}
+    {1067097600 39600 1 AEDT}
+    {1080403200 36000 0 AEST}
+    {1099152000 39600 1 AEDT}
+    {1111852800 36000 0 AEST}
+    {1130601600 39600 1 AEDT}
+    {1143907200 36000 0 AEST}
+    {1162051200 39600 1 AEDT}
+    {1174752000 36000 0 AEST}
+    {1193500800 39600 1 AEDT}
+    {1207411200 36000 0 AEST}
+    {1223136000 39600 1 AEDT}
+    {1238860800 36000 0 AEST}
+    {1254585600 39600 1 AEDT}
+    {1270310400 36000 0 AEST}
+    {1286035200 39600 1 AEDT}
+    {1301760000 36000 0 AEST}
+    {1317484800 39600 1 AEDT}
+    {1333209600 36000 0 AEST}
+    {1349539200 39600 1 AEDT}
+    {1365264000 36000 0 AEST}
+    {1380988800 39600 1 AEDT}
+    {1396713600 36000 0 AEST}
+    {1412438400 39600 1 AEDT}
+    {1428163200 36000 0 AEST}
+    {1443888000 39600 1 AEDT}
+    {1459612800 36000 0 AEST}
+    {1475337600 39600 1 AEDT}
+    {1491062400 36000 0 AEST}
+    {1506787200 39600 1 AEDT}
+    {1522512000 36000 0 AEST}
+    {1538841600 39600 1 AEDT}
+    {1554566400 36000 0 AEST}
+    {1570291200 39600 1 AEDT}
+    {1586016000 36000 0 AEST}
+    {1601740800 39600 1 AEDT}
+    {1617465600 36000 0 AEST}
+    {1633190400 39600 1 AEDT}
+    {1648915200 36000 0 AEST}
+    {1664640000 39600 1 AEDT}
+    {1680364800 36000 0 AEST}
+    {1696089600 39600 1 AEDT}
+    {1712419200 36000 0 AEST}
+    {1728144000 39600 1 AEDT}
+    {1743868800 36000 0 AEST}
+    {1759593600 39600 1 AEDT}
+    {1775318400 36000 0 AEST}
+    {1791043200 39600 1 AEDT}
+    {1806768000 36000 0 AEST}
+    {1822492800 39600 1 AEDT}
+    {1838217600 36000 0 AEST}
+    {1853942400 39600 1 AEDT}
+    {1869667200 36000 0 AEST}
+    {1885996800 39600 1 AEDT}
+    {1901721600 36000 0 AEST}
+    {1917446400 39600 1 AEDT}
+    {1933171200 36000 0 AEST}
+    {1948896000 39600 1 AEDT}
+    {1964620800 36000 0 AEST}
+    {1980345600 39600 1 AEDT}
+    {1996070400 36000 0 AEST}
+    {2011795200 39600 1 AEDT}
+    {2027520000 36000 0 AEST}
+    {2043244800 39600 1 AEDT}
+    {2058969600 36000 0 AEST}
+    {2075299200 39600 1 AEDT}
+    {2091024000 36000 0 AEST}
+    {2106748800 39600 1 AEDT}
+    {2122473600 36000 0 AEST}
+    {2138198400 39600 1 AEDT}
+    {2153923200 36000 0 AEST}
+    {2169648000 39600 1 AEDT}
+    {2185372800 36000 0 AEST}
+    {2201097600 39600 1 AEDT}
+    {2216822400 36000 0 AEST}
+    {2233152000 39600 1 AEDT}
+    {2248876800 36000 0 AEST}
+    {2264601600 39600 1 AEDT}
+    {2280326400 36000 0 AEST}
+    {2296051200 39600 1 AEDT}
+    {2311776000 36000 0 AEST}
+    {2327500800 39600 1 AEDT}
+    {2343225600 36000 0 AEST}
+    {2358950400 39600 1 AEDT}
+    {2374675200 36000 0 AEST}
+    {2390400000 39600 1 AEDT}
+    {2406124800 36000 0 AEST}
+    {2422454400 39600 1 AEDT}
+    {2438179200 36000 0 AEST}
+    {2453904000 39600 1 AEDT}
+    {2469628800 36000 0 AEST}
+    {2485353600 39600 1 AEDT}
+    {2501078400 36000 0 AEST}
+    {2516803200 39600 1 AEDT}
+    {2532528000 36000 0 AEST}
+    {2548252800 39600 1 AEDT}
+    {2563977600 36000 0 AEST}
+    {2579702400 39600 1 AEDT}
+    {2596032000 36000 0 AEST}
+    {2611756800 39600 1 AEDT}
+    {2627481600 36000 0 AEST}
+    {2643206400 39600 1 AEDT}
+    {2658931200 36000 0 AEST}
+    {2674656000 39600 1 AEDT}
+    {2690380800 36000 0 AEST}
+    {2706105600 39600 1 AEDT}
+    {2721830400 36000 0 AEST}
+    {2737555200 39600 1 AEDT}
+    {2753280000 36000 0 AEST}
+    {2769609600 39600 1 AEDT}
+    {2785334400 36000 0 AEST}
+    {2801059200 39600 1 AEDT}
+    {2816784000 36000 0 AEST}
+    {2832508800 39600 1 AEDT}
+    {2848233600 36000 0 AEST}
+    {2863958400 39600 1 AEDT}
+    {2879683200 36000 0 AEST}
+    {2895408000 39600 1 AEDT}
+    {2911132800 36000 0 AEST}
+    {2926857600 39600 1 AEDT}
+    {2942582400 36000 0 AEST}
+    {2958912000 39600 1 AEDT}
+    {2974636800 36000 0 AEST}
+    {2990361600 39600 1 AEDT}
+    {3006086400 36000 0 AEST}
+    {3021811200 39600 1 AEDT}
+    {3037536000 36000 0 AEST}
+    {3053260800 39600 1 AEDT}
+    {3068985600 36000 0 AEST}
+    {3084710400 39600 1 AEDT}
+    {3100435200 36000 0 AEST}
+    {3116764800 39600 1 AEDT}
+    {3132489600 36000 0 AEST}
+    {3148214400 39600 1 AEDT}
+    {3163939200 36000 0 AEST}
+    {3179664000 39600 1 AEDT}
+    {3195388800 36000 0 AEST}
+    {3211113600 39600 1 AEDT}
+    {3226838400 36000 0 AEST}
+    {3242563200 39600 1 AEDT}
+    {3258288000 36000 0 AEST}
+    {3274012800 39600 1 AEDT}
+    {3289737600 36000 0 AEST}
+    {3306067200 39600 1 AEDT}
+    {3321792000 36000 0 AEST}
+    {3337516800 39600 1 AEDT}
+    {3353241600 36000 0 AEST}
+    {3368966400 39600 1 AEDT}
+    {3384691200 36000 0 AEST}
+    {3400416000 39600 1 AEDT}
+    {3416140800 36000 0 AEST}
+    {3431865600 39600 1 AEDT}
+    {3447590400 36000 0 AEST}
+    {3463315200 39600 1 AEDT}
+    {3479644800 36000 0 AEST}
+    {3495369600 39600 1 AEDT}
+    {3511094400 36000 0 AEST}
+    {3526819200 39600 1 AEDT}
+    {3542544000 36000 0 AEST}
+    {3558268800 39600 1 AEDT}
+    {3573993600 36000 0 AEST}
+    {3589718400 39600 1 AEDT}
+    {3605443200 36000 0 AEST}
+    {3621168000 39600 1 AEDT}
+    {3636892800 36000 0 AEST}
+    {3653222400 39600 1 AEDT}
+    {3668947200 36000 0 AEST}
+    {3684672000 39600 1 AEDT}
+    {3700396800 36000 0 AEST}
+    {3716121600 39600 1 AEDT}
+    {3731846400 36000 0 AEST}
+    {3747571200 39600 1 AEDT}
+    {3763296000 36000 0 AEST}
+    {3779020800 39600 1 AEDT}
+    {3794745600 36000 0 AEST}
+    {3810470400 39600 1 AEDT}
+    {3826195200 36000 0 AEST}
+    {3842524800 39600 1 AEDT}
+    {3858249600 36000 0 AEST}
+    {3873974400 39600 1 AEDT}
+    {3889699200 36000 0 AEST}
+    {3905424000 39600 1 AEDT}
+    {3921148800 36000 0 AEST}
+    {3936873600 39600 1 AEDT}
+    {3952598400 36000 0 AEST}
+    {3968323200 39600 1 AEDT}
+    {3984048000 36000 0 AEST}
+    {4000377600 39600 1 AEDT}
+    {4016102400 36000 0 AEST}
+    {4031827200 39600 1 AEDT}
+    {4047552000 36000 0 AEST}
+    {4063276800 39600 1 AEDT}
+    {4079001600 36000 0 AEST}
+    {4094726400 39600 1 AEDT}
 }