[globus-gram-protocol: 26/29] Merge remote-tracking branch 'origin/f13/master'

[Mattias Ellert]

commit 8787bda66890877a5d180d99d29a7dedc2e0b8ce
Merge: 7050d09 f9d9d98
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 30 07:56:21 2011 +0200

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

---