Merge branch 'master' of ssh://sources.redhat.com/git/glibc
authorUlrich Drepper <drepper@redhat.com>
Thu, 24 Dec 2009 02:50:11 +0000 (18:50 -0800)
committerUlrich Drepper <drepper@redhat.com>
Thu, 24 Dec 2009 02:50:11 +0000 (18:50 -0800)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge