[libuser/f14/master: 2/2] Merge branch 'f13' into f14

[Miloslav Trmac]

commit af024384d1ef7c53acfd908f7f9135ae84fa5374
Merge: 67786c5 3df0f18
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Mon Jan 10 20:37:06 2011 +0100

    Merge branch 'f13' into f14
    
    Conflicts:
    	libuser.spec

 libuser.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc libuser.spec
index f95251e,71a3863..3e87db8
--- a/libuser.spec
+++ b/libuser.spec
@@@ -126,31 -120,10 +126,31 @@@ python -c "import libuser
  %{_datadir}/gtk-doc/html/*
  
  %changelog
 -* Mon Jan 10 2011 Miloslav Trmač <mitr at redhat.com> - 0.56.16-1.2
 +* Mon Jan 10 2011 Miloslav Trmač <mitr at redhat.com> - 0.56.18-3
- - Correctly mark the LDAP default password value as encrypted
+ - Correctly mark the LDAP default password value as encrypted (CVE-2011-0002)
    Resolves: #668534
  
 +* Wed Sep 29 2010 Miloslav Trmač <mitr at redhat.com> - 0.56.18-2
 +- Handle matchpathcon() failing with ENOENT
 +  Resolves: #631717
 +
 +* Tue Sep 14 2010 Miloslav Trmač <mitr at redhat.com> - 0.56.18-1
 +- Update to libuser-0.56.18
 +
 +* Wed Sep  1 2010 Miloslav Trmač <mitr at redhat.com> - 0.56.17-2
 +- Change default crypt_style to sha512
 +  Resolves: #629001
 +
 +* Thu Aug 26 2010 Miloslav Trmač <mitr at redhat.com> - 0.56.17-1
 +- Update to libuser-0.56.17
 +
 +* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.56.16-3
 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 +
 +* Fri Jul  2 2010 Miloslav Trmač <mitr at redhat.com> - 0.56.16-2
 +- Provide LU_VALUE_INVALID_ID and id_t validation in the Python module
 +  Resolves: #610838
 +
  * Thu Mar 25 2010 Miloslav Trmač <mitr at redhat.com> - 0.56.16-1
  - Update to libuser-0.56.16.