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

[Mattias Ellert]

commit 517234a4f6dae257c971afa407e08d44c5c85eac
Merge: 830dfc4 17fa213
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'

---