9b74265 Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/389-admin into f14

Merged and Committed by rmeggins 13 years ago
    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/389-admin into f14
    
    Conflicts:
    	389-admin.spec
    	sources
    
        
file modified
+2 -1