54390b Merge branch 'f12' into el6

Merged and Committed by rmeggins 10 years ago
    Merge branch 'f12' into el6
    
    Conflicts:
    
    	.gitignore
    	389-ds-base-git-local.sh
    	389-ds-base-git.sh
    	389-ds-base.spec
    	sources
    
        
file modified
+2 -1
file modified
+1 -1
file modified
+1 -1
file modified
+16 -2
file modified
+1 -1