a61c388 Merge branch 'master' into el5

Merged and Committed by rmeggins 13 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    
    	389-admin.spec
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+6 -3
file modified
+1 -1