13e7ea - Merge upstream changes

Authored and Committed by Daniel J Walsh 16 years ago
    - Merge upstream changes
    - Add Xavier Toth patches
    
        
file modified
+14 -6