2fac1d - Update with latest changes from upstream

Authored and Committed by dwalsh 13 years ago
    - Update with latest changes from upstream
    
        
file modified
+1 -0
file modified
+896 -933
file modified
+6 -3
file modified
+1 -1