ab7b5a5 Merge branch 'el6' into el5

Merged and Committed by agoode 13 years ago
    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	jai-imageio-core.spec
    	sources
    
        
file removed
-21
README-fedora-epel.txt README-epel.txt
file renamed
+3 -3
file removed
-1
file modified
+3 -3