841f6a7 - Cherry-pick r6418 from upstream

Authored and Committed by lkundrak 14 years ago
    - Cherry-pick r6418 from upstream
    
        
file modified
+6 -1