[globus-common/f13/master: 7/7] Merge branch 'master' into f14

[Mattias Ellert]

commit f56d4080034c3ec2c80c81b8f62ef40a20954aeb
Merge: 628d868 b312784
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Aug 8 19:42:10 2010 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	globus-common.spec

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