59571a - Merge upstream changes

Authored and Committed by Daniel J Walsh 16 years ago
    - Merge upstream changes
    - Add Xavier Toth patches
    
        
file modified
+5 -0
file modified
+170 -92
file modified
+1 -1