[python-iso8601/el5/master: 3/3] Merge branch 'master' into el5

[Ian Weller]

commit 5d8daf4d5e2d1dce27d22af20ff238851b7bdf2d
Merge: 5a85af9 802216d
Author: Ian Weller <ian at ianweller.org>
Date:   Sun Oct 10 13:06:32 2010 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 .gitignore          |    1 +
 python-iso8601.spec |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 sources             |    1 +
 3 files changed, 56 insertions(+), 0 deletions(-)
---