[smbldap-tools: 17/17] Merge branch 'master' into el4

[Paul Howarth]

commit 7bb9c608e4f307c2610a6b92edbc058e85483e1b
Merge: d7f83ff ef186c0
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Dec 9 18:45:32 2010 +0000

    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    2 +-
 ...onfig.patch => smbldap-tools-0.9.6-config.patch |   24 ++-
 smbldap-tools-0.9.6-nscd.patch                     |  204 ++++++++++++++++++++
 smbldap-tools-0.9.6-utf-8.patch                    |   24 +++
 smbldap-tools.spec                                 |  112 ++++++++++-
 sources                                            |    2 +-
 6 files changed, 349 insertions(+), 19 deletions(-)
---