8fea83 - Update to latest from upstream

Authored and Committed by dwalsh 13 years ago
    - Update to latest from upstream
    
        
file modified
+1 -0
file added
+8456
file modified
+10 -4
file modified
+1 -1