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

[Petr Machata]

commit 48ec16134782898517b60a7b5bb66242080519dc
Merge: eac8d20 c8135b0
Author: Petr Machata <pmachata at redhat.com>
Date:   Mon Jun 27 16:51:46 2011 +0200

    Merge branch 'master' into f14

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