6300545 Merged with upstream version

Authored and Committed by Matt Wringe 17 years ago
    Merged with upstream version
    
        
file modified
+10 -8