[tzdata/f17: 3/3] Merge branch 'f16' into f17

[Petr Machata]

commit daafca592d1e28d13b5f845babd6544335a20468
Merge: 7f92ed6 8618330
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed Mar 7 00:13:29 2012 +0100

    Merge branch 'f16' into f17
    
    Conflicts:
    	tzdata.spec

 .gitignore                 |    2 +
 sources                    |    4 +-
 tzdata-2011n-chile.patch   |   43 ------------------------
 tzdata-2011n-leapsec.patch |   77 --------------------------------------------
 tzdata.spec                |   22 ++++++++----
 5 files changed, 18 insertions(+), 130 deletions(-)
---
diff --cc tzdata.spec
index 2113b4a,ec1d4ef..fe013a0
--- a/tzdata.spec
+++ b/tzdata.spec
@@@ -120,7 -116,17 +116,17 @@@ rm -rf %{buildroot
  %{_datadir}/javazi
  
  %changelog
+ * Tue Mar  6 2012 Petr Machata <pmachata at redhat.com> - 2012b-1
 -- Rebase to 2012b; changes vs. 2011n-4:
++- Rebase to 2012b; changes vs. 2011n-5:
+   - Changes to zones for Antarctica stations
+   - Armenia abolished DST in 2012 and forward
+   - Cuba enters DST on 31st March
+   - Falkland Islands will stay on permanent Summer Time
+   - New zone for Creston Valley, Canada, which differs from Dawson
+     Creek in past stamps.  Changes to historical stamps in Canada.
+   - Last year, Tokelau skipped over the date line together with Samoa
+ 
 -* Fri Feb 24 2012 Petr Machata <pmachata at redhat.com> - 2011n-4
 +* Fri Feb 24 2012 Petr Machata <pmachata at redhat.com> - 2011n-5
  - Add a patch for change in Chilean DST
  - Update URLs