Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Sat, 7 Jan 2012 15:39:03 +0000 (10:39 -0500)
committerUlrich Drepper <drepper@gmail.com>
Sat, 7 Jan 2012 15:39:03 +0000 (10:39 -0500)
commitfbb68a84ee16345203f896f29b93e92a52582201
tree6ea41119ba1f55d479effba3e922845d5f76b9e2
parent28926a1be178dd3b5811219e32b0d6b937bf21cf
parent8ecd6b2a1283a28bcf56cfe48099fafa412a3929
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog