5b27fed Merge branch 'f16' into f15

Merged and Committed by rmeggins 12 years ago
    Merge branch 'f16' into f15
    
    Conflicts:
    	.gitignore
    	389-dsgw.spec
    	sources
    
        
file modified
+1 -0
file modified
+9 -2
file modified
+1 -1