6e04226 - misc. merge review fixes

Authored and Committed by karsten 17 years ago
1 file changed. 20 lines added. 17 lines removed.
    - misc. merge review fixes
    
        
file modified
+20 -17