[globus-gsi-proxy-core: 35/37] Merge remote-tracking branch 'origin/el5/master'

[Mattias Ellert]

commit f6163a652cabff54f3e7bc0700d4252311b9f0c8
Merge: a08d94a d7ab9d5
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Feb 27 14:24:32 2011 +0100

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

---