[condor/f17: 2/2] Merge branch 'f16' into f17

[tstclair]

commit b47d294b9413654e4be9e4a902a7d8ba973d8d63
Merge: a04ffdb 5535c02
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Wed Mar 7 14:12:34 2012 -0600

    Merge branch 'f16' into f17

 .gitignore  |    1 +
 condor.spec |    7 +++----
 sources     |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---