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

[Stephen Gallagher]

commit 6c98786c02ba8533ca8c92dc3f9d81e5f264ab5c
Merge: a226318 a885ab8
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Dec 22 15:21:00 2011 -0500

    Merge branch 'master' into f16

 .gitignore |    1 +
 sources    |    2 +-
 sssd.spec  |   20 ++++++++++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)
---
diff --cc sssd.spec
index 3650a28,f40507b..f630464
--- a/sssd.spec
+++ b/sssd.spec
@@@ -15,10 -15,10 +15,10 @@@
  
  # 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.4
+ Version: 1.7.0
  Release: 1%{?dist}
  Group: Applications/System
  Summary: System Security Services Daemon