05253e8 Merge branch 'f17' into el6

Merged and Committed by denisarnaud 11 years ago
    Merge branch 'f17' into el6
    
        
file modified
+8 -9
file modified
+10 -1
file modified
+1 -1