Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Fri, 27 Jan 2012 20:06:37 +0000 (15:06 -0500)
committerUlrich Drepper <drepper@gmail.com>
Fri, 27 Jan 2012 20:06:37 +0000 (15:06 -0500)
commitcdd9b365f92e0f30d64094a8400dec2a7e494110
tree78f21a4596953ac23f5c02eb1fb693e9412993d2
parent6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4
parent8db218828187d58575c509b6ed3da0cad9f73519
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog