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

[tstclair]

commit 7fabe1e99512092b2c9e1c5c1e7760beb1b4fbd1
Merge: b47d294 260c9ce
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Fri Apr 27 15:35:10 2012 -0500

    Merge branch 'f16' into f17

 .gitignore           |    1 +
 condor-tmpfiles.conf |    3 +--
 condor.spec          |   47 +++++++++++++++++++++++++++++++++++------------
 generate-tarball.sh  |    3 +--
 sources              |    2 +-
 5 files changed, 39 insertions(+), 17 deletions(-)
---