Merge branch 'master' of ssh://sourceware.org/git/glibc
commit6ce0bb748d7de856cb2076b41625fe7cedac5e16
authorUlrich Drepper <drepper@gmail.com>
Tue, 19 Oct 2010 16:47:13 +0000 (19 12:47 -0400)
committerUlrich Drepper <drepper@gmail.com>
Tue, 19 Oct 2010 16:47:13 +0000 (19 12:47 -0400)
treef55b2908bb8b2f28cc80e6753d47161b46aa58c7
parent475facd1f553ad6d45de1137bd2a22e70307c7bf
parent7c08a05c5f4f86f9e249c2554b1628da0f812364
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog