[myproxy/el4/master: 21/21] Merge commit '78dda82' into el4

[stevetraylen]

commit 4f84dfc3ed883a0ab228c62f0398c6cdbff8c799
Merge: 2ab3976 78dda82
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Jan 18 17:15:44 2011 +0100

    Merge commit '78dda82' into el4
    
    Conflicts:
    	.gitignore
    	myproxy.spec
    	sources

 .gitignore   |    2 +-
 myproxy.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 4187e44,05d273a..0010d07
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--myproxy-5.2.tar.gz
+ /myproxy-5.3.tar.gz