79b5c47 - Update from upstream

Authored and Committed by dwalsh 17 years ago
    - Update from upstream
    
        
file modified
+4 -1