[myproxy/el6: 11/11] Merge branch 'master' into el6

[stevetraylen]

commit b223431619ff65d3e5da577894b865587596070c
Merge: 215ccd3 484edc9
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Aug 31 06:50:10 2011 +0200

    Merge branch 'master' into el6

 .gitignore                  |    1 +
 myproxy-globus-7129.patch   |  110 +++++++++++++++++++++++++++++++++++++++++++
 myproxy-vomsc-vomsapi.patch |   12 -----
 myproxy.spec                |   93 ++++++++++++++++++++++--------------
 sources                     |    2 +-
 5 files changed, 168 insertions(+), 50 deletions(-)
---
diff --cc .gitignore
index 0010d07,6776360..a6f74ec
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -myproxy-5.2.tar.gz
  /myproxy-5.3.tar.gz
+ /myproxy-5.4.tar.gz