[sssd/f16: 3/3] Merge branch 'master' into f16

[Stephen Gallagher]

commit a226318d1aa1e7cf26812f236dbab3cf96b350be
Merge: 4e62740 f73d44d
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Dec 19 16:15:53 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	sssd.spec

 .gitignore                                         |    1 +
 ...ix-removing-in-old-domain-when-saving-a-n.patch |   35 ----
 ...nsure-that-all-input-strings-are-valid-UT.patch |  172 --------------------
 ...DAP-Try-next-failover-server-on-any-error.patch |   38 -----
 sources                                            |    2 +-
 sssd.spec                                          |   17 ++-
 6 files changed, 14 insertions(+), 251 deletions(-)
---
diff --cc sssd.spec
index 10445ef,d29b71f..3650a28
--- a/sssd.spec
+++ b/sssd.spec
@@@ -15,11 -15,11 +15,11 @@@
  
  # Determine the location of the LDB modules directory
  %global ldb_modulesdir %(pkg-config --variable=modulesdir ldb)
 -%global ldb_version 1.1.4
 +%global ldb_version 1.1.0
  
  Name: sssd
- Version: 1.6.3
- Release: 4%{?dist}
+ Version: 1.6.4
+ Release: 1%{?dist}
  Group: Applications/System
  Summary: System Security Services Daemon
  License: GPLv3+