[tzdata/f15: 2/2] Merge branch 'master' into f15

[Petr Machata]

commit 4dd904a15100c752c2d95adda0bc41898dd896e7
Merge: d6f8662 c8135b0
Author: Petr Machata <pmachata at redhat.com>
Date:   Mon Jun 27 16:51:36 2011 +0200

    Merge branch 'master' into f15

 tzdata-2011g-kemerovo.patch |   14 --------------
 tzdata-2011h-kemerovo.patch |   16 ++++++++++++++++
 tzdata.spec                 |    6 +++---
 3 files changed, 19 insertions(+), 17 deletions(-)
---