Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@redhat.com>
Mon, 16 Aug 2010 14:07:05 +0000 (07:07 -0700)
committerUlrich Drepper <drepper@redhat.com>
Mon, 16 Aug 2010 14:07:05 +0000 (07:07 -0700)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge