586d504 Merge branch 'f16' into el6

Merged and Committed by scop 11 years ago
    Merge branch 'f16' into el6
    
        
file modified
+8 -1