[globus-gram-job-manager-callout-error: 16/18] Merge remote-tracking branch 'origin/el6/master'

[Mattias Ellert]

commit 1dda485d29f71fefda05e8a4d76f244833f01d5f
Merge: 17ee671 5b29005
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 30 07:56:39 2011 +0200

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

---