8a482d - Merge upstream changes

Authored and Committed by dwalsh 11 years ago
    - Merge upstream changes
    - Add Xavier Toth patches
    
        
file modified
+1 -0
file modified
+65 -86
file modified
+528 -768
file modified
+1 -1