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

[Stephen Gallagher]

commit 91149e7affb77e5c2df50a0b0565fd0e62e939a7
Merge: 6b9c1a0 72bc2e1
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jul 5 15:01:10 2011 -0400

    Merge branch 'master' into f15

 sssd.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc sssd.spec
index f015dcc,8591744..247339a
--- a/sssd.spec
+++ b/sssd.spec
@@@ -5,10 -5,10 +5,10 @@@
  
  # Determine the location of the LDB modules directory
  %global ldb_modulesdir %(pkg-config --variable=modulesdir ldb)
 -%global ldb_version 1.0.2
 +%global ldb_version 1.0.0
  
  Name: sssd
- Version: 1.5.10
+ Version: 1.5.11
  Release: 1%{?dist}
  Group: Applications/System
  Summary: System Security Services Daemon