ae44ff2 Merge branch 'f15' into f16

Merged and Committed by Timothy St. Clair 12 years ago
    Merge branch 'f15' into f16
    
    Conflicts:
    	condor.spec
    
        
file modified
+0 -5
file removed
-122246
file removed
-13
file modified
+0 -0
file modified
+100 -200
file modified
+1 -1