fa954e1 Merge branch 'master' into el5

Merged and Committed by rmeggins 13 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    
    	.gitignore
    	389-admin-git-local.sh
    	389-admin-git.sh
    	389-admin.spec
    	sources
    
        
file modified
+2 -1
file modified
+1 -1
file modified
+1 -1
file modified
+7 -2
file modified
+1 -1