8f74c37 Resync to latest 1.6

Authored and Committed by cfeist 12 years ago
    Resync to latest 1.6
    
        
file modified
+1 -0
file modified
+27 -8
file modified
+1 -1