c6ad3cd Correct wrong cross-merge

Authored and Committed by lkundrak 15 years ago
    Correct wrong cross-merge
    
        
file modified
+3 -3