dd8ae6f - Resync with upstream sources, drop obsolete patch.

Authored and Committed by law 11 years ago
      - Resync with upstream sources, drop obsolete patch.
    
        
file modified
+2 -0
file modified
+0 -8
file removed
-114
file modified
+43 -43
file modified
+2 -2