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

[stevetraylen]

commit d6d8a91b9469f61c8f8efa2504048de959ba9317
Merge: 40d669c 0a187e6
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Aug 5 10:01:37 2010 +0200

    Merge branch 'master' into el6

 glite-security-trustmanager.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---