From eac8d20b8b49772ed309ff9fc030467cf891a083 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Jun 27 2011 14:46:09 +0000
Subject: Merge branch 'master' into f14


Conflicts:
	.gitignore
	sources
	tzdata.spec

---

diff --git a/.gitignore b/.gitignore
index 1374d86..40cf432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,5 +51,16 @@ tzdata2010l.tar.gz
 /tzdata2010o.tar.gz
 /tzdata2011a.tar.gz
 /tzcode2011a.tar.gz
+/tzdata2011b.tar.gz
+/tzcode2011b.tar.gz
 tzdata/
 *.rpm
+/tzdata2011d.tar.gz
+/tzcode2011d.tar.gz
+/tzdata2011f.tar.gz
+/tzcode2011e.tar.gz
+/tzdata2011g.tar.gz
+/tzcode2011g.tar.gz
+noarch/
+.build-*
+/tzdata2011h.tar.gz
diff --git a/sources b/sources
index b44920f..4d14f09 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-a068c27e7e426fdb12ab0c88506df20d  tzdata2011g.tar.gz
 ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
+546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 83efe90..aa3d5b4 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011g
+Version: 2011h
 %define tzdata_version 2011g
-%define tzcode_version 2011g
+%define tzcode_version 2011h
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -113,6 +113,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Jun 27 2011 Petr Machata <pmachata@redhat.com> - 2011h-1
+- Upstream 2011h:
+  - Russia abandons DST in 2011.
+  - *.tab: change AN (Netherlands Antilles) to CW (Curacao)
+
 * Tue Apr 26 2011 Petr Machata <pmachata@redhat.com> - 2011g-1
 - Upstream 2011e:
   - Morocco introduced DST for 2011 from April 2 to July 31.