[globus-xio: 27/28] Merge remote-tracking branch 'origin/el5/master'

[Mattias Ellert]

commit 333166f0af3e40aee2d6b078bdf91b2fb283c180
Merge: b20bde7 88338dd
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 30 07:56:45 2011 +0200

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

---