d890df7 Merge branch 'f17'

Merged and Committed by teigland 11 years ago
    Merge branch 'f17'
    
    Conflicts:
    	sanlock.spec
    
    Update to sanlock-2.4
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1