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

[stevetraylen]

commit b121df233d364e1033b1f24641e5f664e50d3f86
Merge: 359b886 aa02c8b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Dec 19 16:35:56 2012 +0100

    Merge branch 'master' into el5

 myproxy.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---