acb275b -sync with upstream

Authored and Committed by kzak 19 years ago
    -sync with upstream
    
        
file modified
+1 -1
file modified
+5 -2
file modified
+1 -1