e3ad025 Fix up merge from F-11

Authored and Committed by lkundrak 14 years ago
    Fix up merge from F-11
    
        
file modified
+17 -31