ef186c0 Merge branch 'master' into el5

Merged and Committed by pghmcfc 13 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	smbldap-tools-0.9.2-config.patch
    	smbldap-tools-0.9.4-config.patch
    	smbldap-tools-0.9.6-config.patch
    	smbldap-tools.spec
    	sources
    
        
file modified
+1 -1
smbldap-tools-0.9.6-config.patch smbldap-tools-0.9.4-config.patch
file renamed
+16 -8
file modified
+103 -9
file modified
+1 -1