fix merge problem with previous commit
Merge branch 'master' of ingwe:/p/condor/repository/CONDOR_SRC