32a7593 Merge branch 'master' into f18

Merged and Committed by Rex Dieter 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	openjpeg.spec
    
        
file modified
+1 -0
file modified
+60 -31
file modified
+1 -1