4adf266 Merge with upstream

Authored and Committed by Permaine Cheung 16 years ago
    Merge with upstream
    
        
file added
+8
file added
+8
file modified
+63 -18