[globus-gram-job-manager-setup-condor: 13/16] Merge remote-tracking branch 'origin/f13/master'

[Mattias Ellert]

commit 081cb15f83c683e1732542d487630303ee492a72
Merge: 7889449 d936ec8
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 30 07:56:21 2011 +0200

    Merge remote-tracking branch 'origin/f13/master'

---