d577956 Merge with master

Authored and Committed by Martin Stransky 12 years ago
    Merge with master
    
        
file modified
+16 -2