[globus-common/f12/master: 12/12] Merge branch 'master' into f12

[Mattias Ellert]

commit e71710c95bc5169bfb21f3a798132de28a47e820
Merge: 9904617 b312784
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Aug 8 20:29:23 2010 +0200

    Merge branch 'master' into f12

 globus-common-setup.patch |    2 +-
 globus-common-usr.patch   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---