8d197dd - Merge upstream changes

Authored and Committed by dwalsh 12 years ago
    - Merge upstream changes
    - Add Xavier Toth patches
    
        
file modified
+86 -71
file modified
+18 -10
file modified
+14 -13