b844bb2 - Merge upstream changes

Authored and Committed by dwalsh 15 years ago
    - Merge upstream changes
    - Add Xavier Toth patches
    
        
file modified
+1 -2
file modified
+741 -734