17bb9c - Merge with upstream, get rid of the endorsed patch

Authored and Committed by Permaine Cheung 17 years ago
    - Merge with upstream, get rid of the endorsed patch
    
        
file modified
+1 -6
file modified
+140 -40
file modified
+1 -1