[globus-gass-transfer: 22/24] Merge remote-tracking branch 'origin/el6/master'

[Mattias Ellert]

commit 8ec43f087fe03d860632166e44f41e7047b3dd72
Merge: d246402 819790f
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'

---