Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Fri, 9 Sep 2011 22:21:39 +0000 (18:21 -0400)
committerUlrich Drepper <drepper@gmail.com>
Fri, 9 Sep 2011 22:21:39 +0000 (18:21 -0400)
commite4899e7b9adbf74145f6530f6f57517f773e330c
treef8cc421a27739d5e2775478cac6707bd414949d1
parentf22e10748fbabbf07161eb7a5540b8c0e18553c4
parent0a2349f929e937fb335ba53e217c05f5aa5d66d5
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog
stdio-common/vfscanf.c