Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Sun, 9 Oct 2011 17:17:46 +0000 (13:17 -0400)
committerUlrich Drepper <drepper@gmail.com>
Sun, 9 Oct 2011 17:17:46 +0000 (13:17 -0400)
commitd9db0846f214b39d2ecb58ab6cd7178a38dd401e
tree3fb0f99960a29a322849312b781c0fa3a06b6ad2
parentc853acd567ed81e9493b1f7825e00334a8c7fc0b
parent110946e473b38fc3896212e416d9d7064fecd5b7
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog