cb05907 Update to upstream 1.6

Authored and Committed by jsanders 14 years ago
    Update to upstream 1.6
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+6 -3