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

Conflicts:
	sources
	tzdata.spec

.gitignore

@@ -46,3 +46,8 @@ tzdata2010k.tar.gz
 tzcode2010k.tar.gz
 tzcode2010l.tar.gz
 tzdata2010l.tar.gz
+/tzdata2010n.tar.gz
+/tzcode2010n.tar.gz
+/tzdata2010o.tar.gz
+/tzdata2011a.tar.gz
+/tzcode2011a.tar.gz

sources

@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-a7a776a5713831993e814fe0c05f9fd5  tzcode2010n.tar.gz
-5cae5c56fad81dc29f8fcd933a05768e  tzdata2010o.tar.gz
+d60f168fb7307d8c1b926c7dc3a6c5c1  tzdata2011a.tar.gz
+001db5591974e6db7797a90cbdcbbadc  tzcode2011a.tar.gz

tzdata.spec

@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2010o
-%define tzdata_version 2010o
-%define tzcode_version 2010n
+Version: 2011a
+%define tzdata_version 2011a
+%define tzcode_version 2011a
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -111,6 +111,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Jan 24 2011 Petr Machata <pmachata@redhat.com> - 2011a-1
+- Upstream 2011a:
+  - Updates of historical stamps for Hawaii
+
 * Tue Nov 09 2010 Petr Machata <pmachata@redhat.com> - 2010o-1
 - Upstream 2010o:
   - Fiji will end DST on March 6, 2011, not March 27, 2011