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

[Mattias Ellert]

commit 41489d41f069276a36f18ca83c0e4295591be856
Merge: d2b7ee4 7b982ce
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Mar 29 15:00:16 2011 +0200

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

---