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

[Stephen Gallagher]

commit 5ad73e86a31bc676a2c3b708f7c49718f363951a
Merge: f6eb8f4 3eed4c3
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Mar 24 15:31:25 2011 -0400

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

 .gitignore                                         |    1 +
 ...stence-of-GID-number-and-name-in-group-se.patch |  150 --------------------
 ...stence-of-username-uid-and-gid-for-user-e.patch |   55 -------
 sources                                            |    2 +-
 sssd.spec                                          |   31 +++--
 5 files changed, 19 insertions(+), 220 deletions(-)
---
diff --cc sssd.spec
index 07e7662,f3e2d7b..22830d0
--- a/sssd.spec
+++ b/sssd.spec
@@@ -3,9 -3,13 +3,13 @@@
  %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
  %endif
  
+ # 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.3
- Release: 2%{?dist}
+ Version: 1.5.4
+ Release: 1%{?dist}
  Group: Applications/System
  Summary: System Security Services Daemon
  License: GPLv3+