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

[Petr Machata]

commit e3ae6df26fae56c5207f9918e5839032f06235ea
Merge: c059127 9d2390c
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed Sep 21 21:23:58 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	sources
    	tzdata-2011h-kemerovo.patch
    	tzdata-2011i-kemerovo.patch
    	tzdata-2011j-kemerovo.patch
    	tzdata.spec

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 tzdata-2011j-k.patch                               |  451 ++++++++++++++++++++
 ...i-kemerovo.patch => tzdata-2011j-kemerovo.patch |    4 +-
 tzdata.spec                                        |   21 +-
 5 files changed, 472 insertions(+), 7 deletions(-)
---