0df3b08 Update to latest patches from eparis/Upstream

Authored and Committed by dwalsh 11 years ago
    Update to latest patches from eparis/Upstream
    
        
file modified
+1019 -309
file modified
+4 -1