merge trunk

3 files changed, 352 insertions, 2 deletions

diff --git a/library/tzdata/Pacific/Apia b/library/tzdata/Pacific/Apia
index 2e8e128..e6f33ad 100644
--- a/library/tzdata/Pacific/Apia
+++ b/library/tzdata/Pacific/Apia
@@ -10,4 +10,179 @@ set TZData(:Pacific/Apia) {
     {1316872800 -36000 1 WSDT}
     {1325239200 50400 1 WSDT}
     {1333202400 46800 0 WST}
+    {1348927200 50400 1 WSDT}
+    {1365256800 46800 0 WST}
+    {1380376800 50400 1 WSDT}
+    {1396706400 46800 0 WST}
+    {1411826400 50400 1 WSDT}
+    {1428156000 46800 0 WST}
+    {1443276000 50400 1 WSDT}
+    {1459605600 46800 0 WST}
+    {1474725600 50400 1 WSDT}
+    {1491055200 46800 0 WST}
+    {1506175200 50400 1 WSDT}
+    {1522504800 46800 0 WST}
+    {1538229600 50400 1 WSDT}
+    {1554559200 46800 0 WST}
+    {1569679200 50400 1 WSDT}
+    {1586008800 46800 0 WST}
+    {1601128800 50400 1 WSDT}
+    {1617458400 46800 0 WST}
+    {1632578400 50400 1 WSDT}
+    {1648908000 46800 0 WST}
+    {1664028000 50400 1 WSDT}
+    {1680357600 46800 0 WST}
+    {1695477600 50400 1 WSDT}
+    {1712412000 46800 0 WST}
+    {1727532000 50400 1 WSDT}
+    {1743861600 46800 0 WST}
+    {1758981600 50400 1 WSDT}
+    {1775311200 46800 0 WST}
+    {1790431200 50400 1 WSDT}
+    {1806760800 46800 0 WST}
+    {1821880800 50400 1 WSDT}
+    {1838210400 46800 0 WST}
+    {1853330400 50400 1 WSDT}
+    {1869660000 46800 0 WST}
+    {1885384800 50400 1 WSDT}
+    {1901714400 46800 0 WST}
+    {1916834400 50400 1 WSDT}
+    {1933164000 46800 0 WST}
+    {1948284000 50400 1 WSDT}
+    {1964613600 46800 0 WST}
+    {1979733600 50400 1 WSDT}
+    {1996063200 46800 0 WST}
+    {2011183200 50400 1 WSDT}
+    {2027512800 46800 0 WST}
+    {2042632800 50400 1 WSDT}
+    {2058962400 46800 0 WST}
+    {2074687200 50400 1 WSDT}
+    {2091016800 46800 0 WST}
+    {2106136800 50400 1 WSDT}
+    {2122466400 46800 0 WST}
+    {2137586400 50400 1 WSDT}
+    {2153916000 46800 0 WST}
+    {2169036000 50400 1 WSDT}
+    {2185365600 46800 0 WST}
+    {2200485600 50400 1 WSDT}
+    {2216815200 46800 0 WST}
+    {2232540000 50400 1 WSDT}
+    {2248869600 46800 0 WST}
+    {2263989600 50400 1 WSDT}
+    {2280319200 46800 0 WST}
+    {2295439200 50400 1 WSDT}
+    {2311768800 46800 0 WST}
+    {2326888800 50400 1 WSDT}
+    {2343218400 46800 0 WST}
+    {2358338400 50400 1 WSDT}
+    {2374668000 46800 0 WST}
+    {2389788000 50400 1 WSDT}
+    {2406117600 46800 0 WST}
+    {2421842400 50400 1 WSDT}
+    {2438172000 46800 0 WST}
+    {2453292000 50400 1 WSDT}
+    {2469621600 46800 0 WST}
+    {2484741600 50400 1 WSDT}
+    {2501071200 46800 0 WST}
+    {2516191200 50400 1 WSDT}
+    {2532520800 46800 0 WST}
+    {2547640800 50400 1 WSDT}
+    {2563970400 46800 0 WST}
+    {2579090400 50400 1 WSDT}
+    {2596024800 46800 0 WST}
+    {2611144800 50400 1 WSDT}
+    {2627474400 46800 0 WST}
+    {2642594400 50400 1 WSDT}
+    {2658924000 46800 0 WST}
+    {2674044000 50400 1 WSDT}
+    {2690373600 46800 0 WST}
+    {2705493600 50400 1 WSDT}
+    {2721823200 46800 0 WST}
+    {2736943200 50400 1 WSDT}
+    {2753272800 46800 0 WST}
+    {2768997600 50400 1 WSDT}
+    {2785327200 46800 0 WST}
+    {2800447200 50400 1 WSDT}
+    {2816776800 46800 0 WST}
+    {2831896800 50400 1 WSDT}
+    {2848226400 46800 0 WST}
+    {2863346400 50400 1 WSDT}
+    {2879676000 46800 0 WST}
+    {2894796000 50400 1 WSDT}
+    {2911125600 46800 0 WST}
+    {2926245600 50400 1 WSDT}
+    {2942575200 46800 0 WST}
+    {2958300000 50400 1 WSDT}
+    {2974629600 46800 0 WST}
+    {2989749600 50400 1 WSDT}
+    {3006079200 46800 0 WST}
+    {3021199200 50400 1 WSDT}
+    {3037528800 46800 0 WST}
+    {3052648800 50400 1 WSDT}
+    {3068978400 46800 0 WST}
+    {3084098400 50400 1 WSDT}
+    {3100428000 46800 0 WST}
+    {3116152800 50400 1 WSDT}
+    {3132482400 46800 0 WST}
+    {3147602400 50400 1 WSDT}
+    {3163932000 46800 0 WST}
+    {3179052000 50400 1 WSDT}
+    {3195381600 46800 0 WST}
+    {3210501600 50400 1 WSDT}
+    {3226831200 46800 0 WST}
+    {3241951200 50400 1 WSDT}
+    {3258280800 46800 0 WST}
+    {3273400800 50400 1 WSDT}
+    {3289730400 46800 0 WST}
+    {3305455200 50400 1 WSDT}
+    {3321784800 46800 0 WST}
+    {3336904800 50400 1 WSDT}
+    {3353234400 46800 0 WST}
+    {3368354400 50400 1 WSDT}
+    {3384684000 46800 0 WST}
+    {3399804000 50400 1 WSDT}
+    {3416133600 46800 0 WST}
+    {3431253600 50400 1 WSDT}
+    {3447583200 46800 0 WST}
+    {3462703200 50400 1 WSDT}
+    {3479637600 46800 0 WST}
+    {3494757600 50400 1 WSDT}
+    {3511087200 46800 0 WST}
+    {3526207200 50400 1 WSDT}
+    {3542536800 46800 0 WST}
+    {3557656800 50400 1 WSDT}
+    {3573986400 46800 0 WST}
+    {3589106400 50400 1 WSDT}
+    {3605436000 46800 0 WST}
+    {3620556000 50400 1 WSDT}
+    {3636885600 46800 0 WST}
+    {3652610400 50400 1 WSDT}
+    {3668940000 46800 0 WST}
+    {3684060000 50400 1 WSDT}
+    {3700389600 46800 0 WST}
+    {3715509600 50400 1 WSDT}
+    {3731839200 46800 0 WST}
+    {3746959200 50400 1 WSDT}
+    {3763288800 46800 0 WST}
+    {3778408800 50400 1 WSDT}
+    {3794738400 46800 0 WST}
+    {3809858400 50400 1 WSDT}
+    {3826188000 46800 0 WST}
+    {3841912800 50400 1 WSDT}
+    {3858242400 46800 0 WST}
+    {3873362400 50400 1 WSDT}
+    {3889692000 46800 0 WST}
+    {3904812000 50400 1 WSDT}
+    {3921141600 46800 0 WST}
+    {3936261600 50400 1 WSDT}
+    {3952591200 46800 0 WST}
+    {3967711200 50400 1 WSDT}
+    {3984040800 46800 0 WST}
+    {3999765600 50400 1 WSDT}
+    {4016095200 46800 0 WST}
+    {4031215200 50400 1 WSDT}
+    {4047544800 46800 0 WST}
+    {4062664800 50400 1 WSDT}
+    {4078994400 46800 0 WST}
+    {4094114400 50400 1 WSDT}
 }
diff --git a/library/tzdata/Pacific/Fakaofo b/library/tzdata/Pacific/Fakaofo
index 6cfdbd1..6ec98eb 100644
--- a/library/tzdata/Pacific/Fakaofo
+++ b/library/tzdata/Pacific/Fakaofo
@@ -2,6 +2,6 @@
 
 set TZData(:Pacific/Fakaofo) {
     {-9223372036854775808 -41096 0 LMT}
-    {-2177411704 -36000 0 TKT}
-    {1325239200 50400 0 TKT}
+    {-2177411704 -39600 0 TKT}
+    {1325242800 46800 0 TKT}
 }
diff --git a/library/tzdata/Pacific/Fiji b/library/tzdata/Pacific/Fiji
index a408094..e067377 100644
--- a/library/tzdata/Pacific/Fiji
+++ b/library/tzdata/Pacific/Fiji
@@ -13,4 +13,179 @@ set TZData(:Pacific/Fiji) {
     {1299333600 43200 0 FJT}
     {1319292000 46800 1 FJST}
     {1327154400 43200 0 FJT}
+    {1350741600 46800 1 FJST}
+    {1358604000 43200 0 FJT}
+    {1382191200 46800 1 FJST}
+    {1390053600 43200 0 FJT}
+    {1413640800 46800 1 FJST}
+    {1421503200 43200 0 FJT}
+    {1445090400 46800 1 FJST}
+    {1453557600 43200 0 FJT}
+    {1477144800 46800 1 FJST}
+    {1485007200 43200 0 FJT}
+    {1508594400 46800 1 FJST}
+    {1516456800 43200 0 FJT}
+    {1540044000 46800 1 FJST}
+    {1547906400 43200 0 FJT}
+    {1571493600 46800 1 FJST}
+    {1579356000 43200 0 FJT}
+    {1602943200 46800 1 FJST}
+    {1611410400 43200 0 FJT}
+    {1634997600 46800 1 FJST}
+    {1642860000 43200 0 FJT}
+    {1666447200 46800 1 FJST}
+    {1674309600 43200 0 FJT}
+    {1697896800 46800 1 FJST}
+    {1705759200 43200 0 FJT}
+    {1729346400 46800 1 FJST}
+    {1737208800 43200 0 FJT}
+    {1760796000 46800 1 FJST}
+    {1768658400 43200 0 FJT}
+    {1792245600 46800 1 FJST}
+    {1800712800 43200 0 FJT}
+    {1824300000 46800 1 FJST}
+    {1832162400 43200 0 FJT}
+    {1855749600 46800 1 FJST}
+    {1863612000 43200 0 FJT}
+    {1887199200 46800 1 FJST}
+    {1895061600 43200 0 FJT}
+    {1918648800 46800 1 FJST}
+    {1926511200 43200 0 FJT}
+    {1950098400 46800 1 FJST}
+    {1957960800 43200 0 FJT}
+    {1982152800 46800 1 FJST}
+    {1990015200 43200 0 FJT}
+    {2013602400 46800 1 FJST}
+    {2021464800 43200 0 FJT}
+    {2045052000 46800 1 FJST}
+    {2052914400 43200 0 FJT}
+    {2076501600 46800 1 FJST}
+    {2084364000 43200 0 FJT}
+    {2107951200 46800 1 FJST}
+    {2115813600 43200 0 FJT}
+    {2139400800 46800 1 FJST}
+    {2147868000 43200 0 FJT}
+    {2171455200 46800 1 FJST}
+    {2179317600 43200 0 FJT}
+    {2202904800 46800 1 FJST}
+    {2210767200 43200 0 FJT}
+    {2234354400 46800 1 FJST}
+    {2242216800 43200 0 FJT}
+    {2265804000 46800 1 FJST}
+    {2273666400 43200 0 FJT}
+    {2297253600 46800 1 FJST}
+    {2305116000 43200 0 FJT}
+    {2328703200 46800 1 FJST}
+    {2337170400 43200 0 FJT}
+    {2360757600 46800 1 FJST}
+    {2368620000 43200 0 FJT}
+    {2392207200 46800 1 FJST}
+    {2400069600 43200 0 FJT}
+    {2423656800 46800 1 FJST}
+    {2431519200 43200 0 FJT}
+    {2455106400 46800 1 FJST}
+    {2462968800 43200 0 FJT}
+    {2486556000 46800 1 FJST}
+    {2495023200 43200 0 FJT}
+    {2518610400 46800 1 FJST}
+    {2526472800 43200 0 FJT}
+    {2550060000 46800 1 FJST}
+    {2557922400 43200 0 FJT}
+    {2581509600 46800 1 FJST}
+    {2589372000 43200 0 FJT}
+    {2612959200 46800 1 FJST}
+    {2620821600 43200 0 FJT}
+    {2644408800 46800 1 FJST}
+    {2652271200 43200 0 FJT}
+    {2675858400 46800 1 FJST}
+    {2684325600 43200 0 FJT}
+    {2707912800 46800 1 FJST}
+    {2715775200 43200 0 FJT}
+    {2739362400 46800 1 FJST}
+    {2747224800 43200 0 FJT}
+    {2770812000 46800 1 FJST}
+    {2778674400 43200 0 FJT}
+    {2802261600 46800 1 FJST}
+    {2810124000 43200 0 FJT}
+    {2833711200 46800 1 FJST}
+    {2841573600 43200 0 FJT}
+    {2865765600 46800 1 FJST}
+    {2873628000 43200 0 FJT}
+    {2897215200 46800 1 FJST}
+    {2905077600 43200 0 FJT}
+    {2928664800 46800 1 FJST}
+    {2936527200 43200 0 FJT}
+    {2960114400 46800 1 FJST}
+    {2967976800 43200 0 FJT}
+    {2991564000 46800 1 FJST}
+    {2999426400 43200 0 FJT}
+    {3023013600 46800 1 FJST}
+    {3031480800 43200 0 FJT}
+    {3055068000 46800 1 FJST}
+    {3062930400 43200 0 FJT}
+    {3086517600 46800 1 FJST}
+    {3094380000 43200 0 FJT}
+    {3117967200 46800 1 FJST}
+    {3125829600 43200 0 FJT}
+    {3149416800 46800 1 FJST}
+    {3157279200 43200 0 FJT}
+    {3180866400 46800 1 FJST}
+    {3188728800 43200 0 FJT}
+    {3212316000 46800 1 FJST}
+    {3220783200 43200 0 FJT}
+    {3244370400 46800 1 FJST}
+    {3252232800 43200 0 FJT}
+    {3275820000 46800 1 FJST}
+    {3283682400 43200 0 FJT}
+    {3307269600 46800 1 FJST}
+    {3315132000 43200 0 FJT}
+    {3338719200 46800 1 FJST}
+    {3346581600 43200 0 FJT}
+    {3370168800 46800 1 FJST}
+    {3378636000 43200 0 FJT}
+    {3402223200 46800 1 FJST}
+    {3410085600 43200 0 FJT}
+    {3433672800 46800 1 FJST}
+    {3441535200 43200 0 FJT}
+    {3465122400 46800 1 FJST}
+    {3472984800 43200 0 FJT}
+    {3496572000 46800 1 FJST}
+    {3504434400 43200 0 FJT}
+    {3528021600 46800 1 FJST}
+    {3535884000 43200 0 FJT}
+    {3559471200 46800 1 FJST}
+    {3567938400 43200 0 FJT}
+    {3591525600 46800 1 FJST}
+    {3599388000 43200 0 FJT}
+    {3622975200 46800 1 FJST}
+    {3630837600 43200 0 FJT}
+    {3654424800 46800 1 FJST}
+    {3662287200 43200 0 FJT}
+    {3685874400 46800 1 FJST}
+    {3693736800 43200 0 FJT}
+    {3717324000 46800 1 FJST}
+    {3725186400 43200 0 FJT}
+    {3749378400 46800 1 FJST}
+    {3757240800 43200 0 FJT}
+    {3780828000 46800 1 FJST}
+    {3788690400 43200 0 FJT}
+    {3812277600 46800 1 FJST}
+    {3820140000 43200 0 FJT}
+    {3843727200 46800 1 FJST}
+    {3851589600 43200 0 FJT}
+    {3875176800 46800 1 FJST}
+    {3883039200 43200 0 FJT}
+    {3906626400 46800 1 FJST}
+    {3915093600 43200 0 FJT}
+    {3938680800 46800 1 FJST}
+    {3946543200 43200 0 FJT}
+    {3970130400 46800 1 FJST}
+    {3977992800 43200 0 FJT}
+    {4001580000 46800 1 FJST}
+    {4009442400 43200 0 FJT}
+    {4033029600 46800 1 FJST}
+    {4040892000 43200 0 FJT}
+    {4064479200 46800 1 FJST}
+    {4072341600 43200 0 FJT}
+    {4095928800 46800 1 FJST}
 }