d79f1b6 Merge branch 'f13' into f12

Merged and Committed by rmeggins 13 years ago
    Merge branch 'f13' into f12
    
    Conflicts:
    
    	.gitignore
    	389-adminutil.spec
    	sources
    
        
file modified
+1 -1
file modified
+4 -1
file modified
+1 -1