Merge branch 'master' of ssh://sourceware.org/git/glibc
commita5b913e299027a799ae5435d66e3f20e95859654
authorUlrich Drepper <gmail@redhat.com>
Fri, 3 Dec 2010 14:50:35 +0000 (3 09:50 -0500)
committerUlrich Drepper <gmail@redhat.com>
Fri, 3 Dec 2010 14:50:35 +0000 (3 09:50 -0500)
tree1986d40edb80f36d1c5f3c52536b5c4585f4c2f1
parentc038d98d63ccf0da892f2147c6d92a7d2badd87d
parent3a4a2499ec9c87d05a0d7d1522dad3df73c6c9dd
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog