[tzdata/f14: 13/13] Merge branch 'master' into f14

[Petr Machata]

commit eac8d20b8b49772ed309ff9fc030467cf891a083
Merge: 2bd394b 87f47ea
Author: Petr Machata <pmachata at redhat.com>
Date:   Mon Jun 27 16:46:09 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	sources
    	tzdata.spec

 .gitignore  |   11 +++++++++++
 sources     |    2 +-
 tzdata.spec |    9 +++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)
---
diff --cc tzdata.spec
index 83efe90,f05dd88..aa3d5b4
--- a/tzdata.spec
+++ b/tzdata.spec
@@@ -113,17 -113,22 +113,22 @@@ rm -rf %{buildroot
  %{_datadir}/javazi
  
  %changelog
+ * Mon Jun 27 2011 Petr Machata <pmachata at 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 at redhat.com> - 2011g-1
 -- Upstream 2011g:
 -  - Egypt abandons DST in 2011 (and forward)
 -
 -* Wed Apr 20 2011 Petr Machata <pmachata at redhat.com> - 2011f-1
  - Upstream 2011e:
 -  - Canonical version of Chile and Morocco changes
 +  - Morocco introduced DST for 2011 from April 2 to July 31.
 +  - Delay end of DST in Chile in 2011 until May 7.
  - Upstream 2011f:
    - The Falkland Islands will not turn back clocks this winter, but
 -    stay on daylight saving time
 -- Resolves: #696587
 +    stay on daylight saving time.
 +- Upstream 2011g:
 +  - Egypt abandons DST in 2011 (and forward)
 +- Dropped tzdata-2011d-chile.patch
 +- Dropped tzdata-2011d-morocco.patch
  
  * Wed Mar 30 2011 Petr Machata <pmachata at redhat.com> - 2011d-3
  - Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)