Merge remote branch 'origin/master' into f14/master

Conflicts:
	sources
	tzdata.spec

.gitignore

@@ -42,3 +42,7 @@ tzdata2010h.tar.gz
 tzdata2010i.tar.gz
 tzdata2010j.tar.gz
 tzcode2010j.tar.gz
+tzdata2010k.tar.gz
+tzcode2010k.tar.gz
+tzcode2010l.tar.gz
+tzdata2010l.tar.gz

sources

@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-5e2086249d6a6bb116534d358661ad3f  tzdata2010k.tar.gz
-63cd2199679c91bed972a0248d6916af  tzcode2010k.tar.gz
+77668c37a0b13753c65eee5db3a4b009  tzcode2010l.tar.gz
+0458bd8ffd537146d34b1a658c42efa5  tzdata2010l.tar.gz

tzdata.spec

@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010k
-%define tzdata_version 2010k
-%define tzcode_version 2010k
+Version: 2010l
+%define tzdata_version 2010l
+%define tzcode_version 2010l
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,15 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Aug 16 2010 Petr Machata <pmachata@redhat.com> - 2010l-2
+- Upstream 2010l:
+  - Change Cairo's 2010 reversion to DST from the midnight between
+    September 8 and 9 to the midnight between September 9 and 10.
+  - Change Gaza's 2010 return to standard time to the midnight between
+    August 10 and 11.
+  - Bahia de Banderas (Mexican state of Nayarit) changed time zone
+    UTC-7 to new time zone UTC-6 on April 4, 2010
+
 * Tue Aug  3 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2010k-1
 - Upstream 2010k:
  - Egypt has announced that DST will be off during Ramadan, but