d666a26 Merge branch 'f17'

Merged and Committed by teigland 11 years ago
    Merge branch 'f17'
    
    Conflicts:
    	dlm.spec
    
        
file modified
+1 -0
file modified
+8 -2
file modified
+1 -1