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

[stevetraylen]

commit c561f864af8423542eccb2ac5b0e5687b3a09c58
Merge: 323c5b3 aa02c8b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Dec 19 16:35:28 2012 +0100

    Merge branch 'master' into el6

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