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

[Petr Machata]

commit 3e18d0e5de9719d3ed31b9c4cc38ff94d9ef2275
Merge: 991ed64 0acc4ba
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed Oct 19 15:29:27 2011 +0200

    Merge branch 'f14' into f15

 tzdata-2011j-ukraine.patch |   76 ++++++++++++++++++++++++++++++++++++++++++++
 tzdata.spec                |    7 +++-
 2 files changed, 82 insertions(+), 1 deletions(-)
---