[tzdata/f13/master: 14/14] Merge remote branch 'origin/master' into f13/master

[Petr Machata]

commit 6907e50051446981ddd3c8f7016e833ff6bc9142
Merge: 40d7a2d 6d3de1d
Author: Petr Machata <pmachata at redhat.com>
Date:   Mon Aug 16 16:11:38 2010 +0200

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	sources
    	tzdata.spec

 .gitignore  |   13 +++++++++++++
 sources     |    4 ++--
 tzdata.spec |   15 ++++++++++++---
 3 files changed, 27 insertions(+), 5 deletions(-)
---