[rubygem-fastercsv/el5: 9/9] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 4e7a230064c732edec3cbc092235b6e357ef7bdf
Merge: debedf0 2463ed2
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 8 23:03:35 2011 +0200

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	rubygem-fastercsv.spec
    	sources

 .gitignore             |    2 +-
 rubygem-fastercsv.spec |    8 +++++++-
 sources                |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---