f8b2e8b finish merge review fixes

Authored and Committed by vcrhonek 14 years ago
1 file changed. 8 lines added. 7 lines removed.
    finish merge review fixes
    
        
file modified
+8 -7