ba76a32 Merge with upstream version

Authored and Committed by Permaine Cheung 16 years ago
    Merge with upstream version
    
        
file modified
+22 -10