[myproxy/f13/master: 10/10] Merge branch 'master' into f13

[stevetraylen]

commit 91a18a676b26ef6d29093eb48ca5912d29fb1610
Merge: 2b2c4d5 fcc5adc
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Sep 1 20:29:24 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    
    	.gitignore
    	myproxy.spec
    	sources

 .gitignore   |    2 +-
 myproxy.spec |   19 +++++++++----------
 sources      |    2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 2c21f0c,4187e44..baddd21
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- myproxy-5.0.tar.gz
 -myproxy-5.2.tar.gz
++myproxy-5.1.tar.gz
diff --cc myproxy.spec
index 6ec4e76,254673a..a58c883
--- a/myproxy.spec
+++ b/myproxy.spec
@@@ -162,8 -160,7 +160,6 @@@ Package %{name}-doc contains the MyProx
  
  
  %prep
--%setup -q
- %patch0 
  cp -p %{SOURCE1} .
  cp -p %{SOURCE2} .
  cp -p %{SOURCE3} .