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

[Petr Machata]

commit 91dcb97a7cef0c09f7bdd0dc9a15535f577ca15d
Merge: cf659a4 81ac290
Author: Petr Machata <pmachata at redhat.com>
Date:   Thu Nov 3 22:27:40 2011 +0100

    Merge branch 'f14' into f15

 javazic-exclusion-fix.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 tzdata.spec                 |   11 ++++++++---
 2 files changed, 50 insertions(+), 3 deletions(-)
---