[condor/f20: 2/2] Merge branch 'f19' into f20

[tstclair]

commit d81715fdab931d6d01d0fdecb38a1fb51e7357b3
Merge: 8b58534 badf469
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Fri Oct 25 11:11:40 2013 -0500

    Merge branch 'f19' into f20

 BZ1000106.patch |    9 ++
 condor.spec     |  390 +-----------------------------------------------------
 2 files changed, 17 insertions(+), 382 deletions(-)
---