598be1 -Update to latest from upstream

Authored and Committed by dwalsh 14 years ago
    -Update to latest from upstream
    
        
file modified
+1 -0
file modified
+4 -3
file modified
+1 -1