Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Tue, 16 Aug 2011 15:20:14 +0000 (11:20 -0400)
committerUlrich Drepper <drepper@gmail.com>
Tue, 16 Aug 2011 15:20:14 +0000 (11:20 -0400)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge