937c1c - Update from upstream

Authored and Committed by dwalsh 13 years ago
    - Update from upstream
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1