[condor-job-hooks/f15: 3/3] Merge branch 'master' into f15

[rrati]

commit 48a88017d632f0ecda796aee8f57897954ce9dad
Merge: a5abba7 f993b88
Author: Robert Rati <rrati at redhat.com>
Date:   Tue Jan 10 16:50:40 2012 -0600

    Merge branch 'master' into f15

 .gitignore            |    2 ++
 condor-job-hooks.spec |   27 +++++++++++++++++++++------
 sources               |    2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)
---