Merge 20182 from upcoming into trunk
svn merge -c 20182 {branches/upcoming,trunk}/htcondor-ce


git-svn-id: file:///p/condor/workspaces/vdt/svn/native/redhat/trunk/htcondor-ce@20184 4e558342-562e-0410-864c-e07659590f8c
Merge change 20185 from upcoming into trunk
svn merge -c 20185 {branches/upcoming,trunk}/htcondor-ce


git-svn-id: file:///p/condor/workspaces/vdt/svn/native/redhat/trunk/htcondor-ce@20186 4e558342-562e-0410-864c-e07659590f8c
Fix help message code so it is Python 2.4 compatible


git-svn-id: file:///p/condor/workspaces/vdt/svn/native/redhat/trunk/htcondor-ce@20205 4e558342-562e-0410-864c-e07659590f8c
Merge change 20205 from trunk into upcoming
svn merge -c 20205 {trunk,branches/upcoming}/htcondor-ce



git-svn-id: file:///p/condor/workspaces/vdt/svn/native/redhat/branches/upcoming/htcondor-ce@20214 4e558342-562e-0410-864c-e07659590f8c