[glite-security-trustmanager/el6/master: 7/7] Merge branch 'master' into el6

[stevetraylen]

commit 40d669c274f7147d13aafda4df7837d3ea4e3a9a
Merge: 9531374 d01e327
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Aug 5 09:29:47 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    
    	glite-security-trustmanager.spec

 glite-security-trustmanager.spec |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)
---