25a7546 - Update from upstream

Authored and Committed by dwalsh 16 years ago
    - Update from upstream
    
        
file modified
+15 -8