64ffbc1 Update to upstream 2.18.2

Authored and Committed by denis 14 years ago
    Update to upstream 2.18.2
    
        
file modified
+1 -1
file modified
+8 -5
file modified
+1 -1