e44d8c3 Merge branch 'master' into el6

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