1994fdf Merge branch 'master' into f20

Merged and Committed by stransky 9 years ago
    Merge branch 'master' into f20
    
        
file modified
+6 -1