[tzdata: 2/2] Merge remote-tracking branch 'origin/master'

[Petr Machata]

commit 5ed8fc0ee87bbdc673a496e9d05b9c0d6d776aac
Merge: 1a3768f 88c75a1
Author: Petr Machata <pmachata at redhat.com>
Date:   Thu Mar 3 23:17:04 2011 +0100

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	tzdata.spec

 tzdata.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc tzdata.spec
index 59432ee,83ab7a6..fb3f34e
--- a/tzdata.spec
+++ b/tzdata.spec
@@@ -3,7 -3,7 +3,7 @@@ Name: tzdat
  Version: 2011b
  %define tzdata_version 2011b
  %define tzcode_version 2011b
--Release: 2%{?dist}
++Release: 3%{?dist}
  License: Public Domain
  Group: System Environment/Base
  URL: ftp://elsie.nci.nih.gov/pub/
@@@ -113,11 -111,9 +113,14 @@@ rm -rf %{buildroot
  %{_datadir}/javazi
  
  %changelog
- * Thu Mar 03 2011 Petr Machata <pmachata at redhat.com> - 2011b-2
++* Thu Mar 03 2011 Petr Machata <pmachata at redhat.com> - 2011b-3
 +- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
 +  for Metlakatla.  Sitka and Metlakatla are new zones.
 +- Delay end of DST in Chile in 2011 until first Sunday in April. (tzdata-2010b-c.patch)
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011b-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Wed Feb 09 2011 Petr Machata <pmachata at redhat.com> - 2011b-1
  - Upstream 2011b:
    - America/North_Dakota/Beulah: Mercer County, North Dakota, changed