[myproxy/el6/master: 4/5] Merge commit '12deb54' into el6

[stevetraylen]

commit 1ca02b81f942ab8abf80b4aa9d78f146a0b28c93
Merge: b29c193 12deb54
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Feb 22 22:49:49 2011 +0100

    Merge commit '12deb54' into el6

 myproxy-vomsc-vomsapi.patch |   12 ++++++++++++
 myproxy.spec                |   17 ++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---