[tzdata/f14/master: 3/3] Merge remote branch 'origin/master' into f14/master

[Petr Machata]

commit 1ab022745ebf9374301c913308776ce142fb2f50
Merge: 612b2c7 6d3de1d
Author: Petr Machata <pmachata at redhat.com>
Date:   Mon Aug 16 15:30:54 2010 +0200

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

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