db2cc8f Merge branch 'f18'

Merged and Committed by teigland 11 years ago
    Merge branch 'f18'
    
    Conflicts:
    	.gitignore
    	sanlock.spec
    	sources
    
        
file modified
+1 -0
file modified
+74 -1
file modified
+1 -1