Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Mon, 5 Sep 2011 16:46:12 +0000 (12:46 -0400)
committerUlrich Drepper <drepper@gmail.com>
Mon, 5 Sep 2011 16:46:12 +0000 (12:46 -0400)
commit3b142ce5728f6d683f3375fb33099ebf243f6681
tree896f73d70426cd798e72bd786c0cb000d55b50ad
parent2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba
parent5f4318d102d604e2f80bc97927e2d80f76063639
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog