Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master
commit7072e3c9988c12ebbcfa0ac02dd9930b7bb81d3c
authorAndreas Schwab <schwab@redhat.com>
Fri, 17 Jun 2011 12:29:11 +0000 (17 14:29 +0200)
committerAndreas Schwab <schwab@redhat.com>
Fri, 17 Jun 2011 12:29:45 +0000 (17 14:29 +0200)
tree6a5fa18ab2431af478c568a9076239ada94ddb7a
parentc1ddf2f3779eb43c486bc203e18afe843ddde5f6
parent5babac1535735419921ca9edbf5f6c96a40296da
Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master
ChangeLog
NEWS
manual/libc.texinfo
nptl/ChangeLog
sysdeps/posix/getaddrinfo.c