9142ea4 Merge branch 'f16' into f17

Merged and Committed by Timothy St. Clair 12 years ago
    Merge branch 'f16' into f17
    
    Conflicts:
    	condor.spec
    
        
file modified
+1 -0
file modified
+0 -0
file modified
+26 -20
file modified
+53 -33
file modified
+1 -1