205af5 update to upstream 3.6.1

Authored and Committed by Ed Hill 14 years ago
    update to upstream 3.6.1
    
        
file modified
+1 -1
file modified
+14 -7
file modified
+1 -1