ba9d00a Merge remote-tracking branch 'origin/master' into f16

Merged and Committed by rdieter 12 years ago
    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	openjpeg.spec
    
        
file modified
+14 -2