[tzdata/f15: 20/20] Merge branch 'f14' into f15

[Petr Machata]

commit 6ea29d8aaa8d6c68cf8f387a09c8137079537a50
Merge: 3e3100a fecaadd
Author: Petr Machata <pmachata at redhat.com>
Date:   Tue Oct 11 16:29:53 2011 +0200

    Merge branch 'f14' into f15

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 tzdata-2011j-k.patch                               |  451 --------------------
 ...j-kemerovo.patch => tzdata-2011l-kemerovo.patch |    4 +-
 tzdata.spec                                        |   26 +-
 5 files changed, 17 insertions(+), 467 deletions(-)
---