Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Thu, 17 Feb 2011 06:22:52 +0000 (01:22 -0500)
committerUlrich Drepper <drepper@gmail.com>
Thu, 17 Feb 2011 06:22:52 +0000 (01:22 -0500)
commitbe6bd0b7ab68d0ed968138a41b5d18eb930d7443
treec79d676f8937f033b92b4a294255f309ce39cdb9
parentd55fd7a5573ea7c7c14af95bc37618469cde8a5f
parent8e31c82dbd7dad4d33b35d242b5a990f1168a859
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog