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

[stevetraylen]

commit 77e61e84396986b840859d0ab625cbd519047437
Merge: 2c14d05 0c284af
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Aug 4 22:25:43 2010 +0200

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

 clog                          |    2 ++
 glite-security-util-java.spec |   11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
---