[myproxy/f12/master: 20/20] Merge branch 'master' into f12

[stevetraylen]

commit 6708f721f6a42f9bb2585d1fdaadb00394f7a16a
Merge: 55e63ab fcc5adc
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Aug 23 12:46:32 2010 +0200

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

 .gitignore   |    2 +-
 myproxy.spec |   65 +++++++++++++++++++++++++++++++++-------------------------
 sources      |    2 +-
 3 files changed, 39 insertions(+), 30 deletions(-)
---