Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Fri, 11 Nov 2011 18:29:12 +0000 (13:29 -0500)
committerUlrich Drepper <drepper@gmail.com>
Fri, 11 Nov 2011 18:29:12 +0000 (13:29 -0500)
commit1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920
treeb80014598ade05556449724881c200b49b5ffd2d
parentaaddc98c25727f896fc8ed36c5562dc46865dbe6
parent95b7042bac3e2cfc6fef7aec6acc7d46dd50eba5
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog