bbcedc5 - File conflict fix for Bug 455005

Authored and Committed by jspaleta 15 years ago
    - File conflict fix for Bug 455005
    
        
file modified
+6 -2