[smbldap-tools/f13/master: 4/4] Merge remote branch 'origin/master' into f13/master

[Paul Howarth]

commit f7ba85ce32a7f73d0038ab71d59de99d5e54f611
Merge: de5d941 452e2b7
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Dec 9 16:30:17 2010 +0000

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    2 +-
 smbldap-tools-0.9.5-chown.patch                    |   11 ---
 ...onfig.patch => smbldap-tools-0.9.6-config.patch |   14 ++--
 ....5-nscd.patch => smbldap-tools-0.9.6-nscd.patch |   70 +++++++++-------
 ...-utf-8.patch => smbldap-tools-0.9.6-utf-8.patch |   36 +++------
 smbldap-tools.spec                                 |   84 +++++++++++++++-----
 sources                                            |    2 +-
 7 files changed, 123 insertions(+), 96 deletions(-)
---