4545342 - fix fileconflict (#205225)

Authored and Committed by karsten 17 years ago
    - fix fileconflict (#205225)
    
        
file modified
+6 -1