[sssd/f13/master: 19/19] Merge remote branch 'origin/f14/master' into f13

[Stephen Gallagher]

commit 11e00e6922005318a5e8044425a9b7a7aec161a9
Merge: 663a782 c7ce53c
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Sep 28 08:09:36 2010 -0400

    Merge remote branch 'origin/f14/master' into f13

 sssd.spec |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --cc sssd.spec
index d0f6dff,36b6d6d..78b29a7
--- a/sssd.spec
+++ b/sssd.spec
@@@ -462,13 -457,14 +459,20 @@@ f
  %postun -n libref_array -p /sbin/ldconfig
  
  %changelog
+ * Tue Sep 28 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.3.0-32
+ - Resolves: rhbz#637955 - libini_config-devel needs libcollection-devel but
+ -                         doesn't require it
+ 
+ * Thu Sep 16 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.3.0-31
+ - Resolves: rhbz#632615 - the krb5 locator plugin isn't packaged for multilib
+ 
  * Tue Aug 24 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.3.0-30
 +- New upstream version 1.3.0
 +- Improved LDAP failover
 +- Synchronous sysdb API (provides performance enhancements)
 +- Better online reconnection detection
 +
 +* Tue Aug 24 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.2-21
  - Resolves: CVE-2010-2940 - sssd allows null password entry to authenticate
  -                           against LDAP