[glibc: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/glibc

[Patsy Franklin]

commit 7e7bd1effe0774eed79e39859823e05dad8fdc1e
Merge: 1559b7b 5527dc5
Author: Patsy Franklin <pfrankli at redhat.com>
Date:   Fri Jun 1 16:06:21 2012 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/glibc
    
    Conflicts:
    	glibc.spec

 .gitignore |    3 +++
 glibc.spec |   14 +++++++++-----
 sources    |    5 ++---
 3 files changed, 14 insertions(+), 8 deletions(-)
---
diff --cc glibc.spec
index a87524d,99a8f0e..603d09a
--- a/glibc.spec
+++ b/glibc.spec
@@@ -28,7 -28,7 +28,7 @@@
  Summary: The GNU libc libraries
  Name: glibc
  Version: %{glibcversion}
--Release: 7%{?dist}
++Release: 8%{?dist}
  # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
  # Things that are linked directly into dynamically linked programs
  # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@@ -1303,12 -1299,12 +1303,16 @@@ rm -f *.filelist
  %endif
  
  %changelog
- * Fri Jun  1 2012 Patsy Franklin <patsy at redhat.com> - 2.15.90-7
++* Fri Jun  1 2012 Patsy Franklin <patsy at redhat.com> - 2.15.90-8
 +  - Fix iconv() segfault when the invalid multibyte character 0xffff is input when 
 +    converting from IBM930 (823905)
 +
+ * Fri Jun 1 2012 Jeff Law <law at redhat.com> - 2.15.90-7
+   - Resync with upstream sources.  (#827040)
+ 
  * Thu May 31 2012 Patsy Franklin <patsy at redhat.com> - 2.15.90-6
-   - Fix fnmatch() when '*' wildcard is applied on a file name containing multibyte chars. (#819430)
+   - Fix fnmatch() when '*' wildcard is applied on a file name containing
+   multibyte chars. (#819430)
  
  * Wed May 30 2012  Jeff Law <law at redhat.com> - 2.15.90-5
    - Resync with upstream sources.