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

[Petr Machata]

commit 991ed64bfcc28f0043c375a212fc4ca690ef93b0
Merge: 6ea29d8 ff28bf3
Author: Petr Machata <pmachata at redhat.com>
Date:   Fri Oct 14 16:53:07 2011 +0200

    Merge branch 'f14' into f15

 tzdata-2011l-brazil.patch |   18 ++++++++++++++++++
 tzdata.spec               |   11 +++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
---