375ec41 resync w/ F11

Authored and Committed by linville 14 years ago
    resync w/ F11
    
        
file modified
+2 -2
file modified
+17 -4
file modified
+2 -2