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

[Petr Machata]

commit ce514ce9060841289fcfa09b3fcbcc5b3b834776
Merge: d60c5f1 584a263
Author: Petr Machata <pmachata at redhat.com>
Date:   Mon Jan 24 21:48:45 2011 +0100

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

 .gitignore  |    5 +++++
 sources     |    4 ++--
 tzdata.spec |   10 +++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)
---