Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Tue, 31 Jan 2012 03:34:33 +0000 (22:34 -0500)
committerUlrich Drepper <drepper@gmail.com>
Tue, 31 Jan 2012 03:34:33 +0000 (22:34 -0500)
commit0eb6f47528cc10645cb0a6919b3af53166ca4fe8
treedb61d4a90096b60be41fb33d6d87e79d1d9c3b04
parent27a25b6e633a3ea071e229337eaae36d0fa243fa
parentc8a89e7dd5cab24242cc9050387bd5bb902da11a
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog