16c3ff1 - Merge upstream changes

Authored and Committed by dwalsh 12 years ago
    - Merge upstream changes
    - Add Xavier Toth patches
    
        
file modified
+22 -0
file modified
+1530 -1292
file modified
+8 -1