92560e2 Merge branch 'master' into f17

Merged and Committed by hobbes1069 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	OpenImageIO.spec
    
        
file modified
+35 -34