Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 40c1ea99055bea107005c4b25e5dffcd29128dbe,9e03d172579bfe81ef5ef6335543d24a0d324bed..d1498389481ab46dca57597f05103ae2082af6b0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,9 +1,25 @@@
 +2011-07-22  Ulrich Drepper  <drepper@gmail.com>
 +
 +      * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Fix test for
 +      OSXSAVE.
 +      (_dl_x86_64_save_sse): Likewise.
 +
 +      * crypt/crypt_util.c (__init_des_r): Optimize memset calls.
 +
 +      * crypt/crypt_util.c (__init_des_r): Add read barrier as well.
 +
 +2011-07-21  Andreas Schwab  <schwab@redhat.com>
 +
 +      * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Fix last
 +      change.
 +      (_dl_x86_64_save_sse): Use correct AVX check.
 +
+ 2011-07-21  Liubov Dmitrieva  <liubov.dmitrieva@gmail.com>
+ 
+       * sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S: Fix overfow
+       bug in strncpy/strncat.
+       * sysdeps/x86_64/multiarch/strcpy-ssse3.S: Likewise.
+ 
  2011-07-21  Ulrich Drepper  <drepper@gmail.com>
  
        * string/tester.c (test_strcat): Add tests for different alignments