Merge branch 'master' of ssh://sources.redhat.com/git/glibc
commit70c90289ff7e2f1ca976618bcf342d9c65c746fc
authorUlrich Drepper <drepper@redhat.com>
Fri, 26 Mar 2010 02:45:20 +0000 (25 19:45 -0700)
committerUlrich Drepper <drepper@redhat.com>
Fri, 26 Mar 2010 02:45:20 +0000 (25 19:45 -0700)
treeb137a73907e3abed69bafe89483de0af3ce2b814
parent89a4419cc384c090b1eabe610647aa4e14436a3f
parent34b514dff6acf8f1cac0afefd24049e025fd62ea
Merge branch 'master' of ssh://sources.redhat.com/git/glibc

Conflicts:
ChangeLog
ChangeLog
malloc/malloc.c
malloc/tst-mallocstate.c