0676999 Re-synced to upstream sources

Authored and Committed by cfeist 11 years ago
    Re-synced to upstream sources
    
        
file modified
+1 -0
file modified
+9 -9
file modified
+1 -2