fdf9e32 Merge branch 'f17' into f18

Merged and Committed by Timothy St. Clair 11 years ago
    Merge branch 'f17' into f18
    
    Conflicts:
    	condor.spec
    
        
file modified
+1 -0
file modified
+4 -4
file modified
+1 -1