2d9fa26 Merge branch 'f12' into el6

Merged and Committed by rmeggins 13 years ago
    Merge branch 'f12' into el6
    
    Conflicts:
    
    	.gitignore
    	389-ds-base.spec
    	sources
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+45 -17
file modified
+1 -1