[myproxy/el5: 2/2] Merge branch 'master' into el5

[stevetraylen]

commit 9ed69c0971f5f83b101f56b103aef3b98a25632a
Merge: 07ba57b 151c910
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Sep 1 15:31:48 2011 +0200

    Merge branch 'master' into el5

 myproxy-globus-7129-ptII.patch  |   30 ++++++++++++++++++++
 myproxy-globus-7129-ptIII.patch |   57 +++++++++++++++++++++++++++++++++++++++
 myproxy.spec                    |   11 +++++++-
 3 files changed, 97 insertions(+), 1 deletions(-)
---