[globus-rls-server: 26/29] Merge remote-tracking branch 'origin/el6/master'

[Mattias Ellert]

commit d22374e0aad3b8e281b4bff2f59ddbd1b6a86066
Merge: ff58596 0152bad
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Feb 27 15:58:31 2011 +0100

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

---