2f7cab9 Merge with upstream

Authored and Committed by Permaine Cheung 13 years ago
    Merge with upstream
    
        
file added
+6
file modified
+67 -13