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

[stevetraylen]

commit 7ab994c46fbb0a48c785101feaf19a52e01999c1
Merge: f0ecc5d b8e5cd5
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Jun 21 22:01:16 2012 +0200

    Merge branch 'master' into el5

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