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

[Stephen Gallagher]

commit 6b9c1a0b18f2188c8048cca5d084d18418f67ff6
Merge: 9a26a80 807b79d
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Fri Jul 1 08:33:12 2011 -0400

    Merge branch 'master' into f15

 .gitignore |    1 +
 sources    |    2 +-
 sssd.spec  |    8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc sssd.spec
index 4c7bb77,7d5ef90..f015dcc
--- 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.9
+ Version: 1.5.10
  Release: 1%{?dist}
  Group: Applications/System
  Summary: System Security Services Daemon