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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 994655eaf52023e392f930173d544385bff217fa,a5baf6cbe07d5fb5875ae6499be36f8bd8eba85f..97044ae451030486ca791e803c77f459f9af48b3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2010-07-27  Ulrich Drepper  <drepper@redhat.com>
 +
 +      * sysdeps/x86_64/multiarch/strcmp-ssse3.S: Avoid compiling the file
 +      for ld.so.
 +
+ 2010-07-27  Andreas Schwab  <schwab@redhat.com>
+ 
+       * manual/memory.texi (Malloc Tunable Parameters): Document
+       M_PERTURB.
+ 
  2010-07-26  Roland McGrath  <roland@redhat.com>
  
        [BZ #11840]