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

[stevetraylen]

commit 072587d3199ee30b9b1df2bbf71921d63ad00b73
Merge: d07ef5f b8e5cd5
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Jun 21 22:00:55 2012 +0200

    Merge branch 'master' into el6

 .gitignore   |    1 +
 myproxy.spec |   21 +++++++++++++++++----
 sources      |    2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)
---