93b8100 sync with master, el6

Authored and Committed by Bill Nottingham 13 years ago
    sync with master, el6
    
        
file modified
+3 -1
file removed
-13
file removed
-84
file modified
+18 -6
file modified
+1 -1