Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master
commitf1bc19b444568cfdbb8431bd00eb58a59798852f
authorAndreas Schwab <schwab@redhat.com>
Fri, 5 Aug 2011 14:19:11 +0000 (5 16:19 +0200)
committerAndreas Schwab <schwab@redhat.com>
Fri, 5 Aug 2011 14:19:44 +0000 (5 16:19 +0200)
tree0dd38100d71ba21a20fe836affb903deb44134f8
parentcad85ba78211fe51a4c377654f61ca73b8585d0e
parente2a309033d626c4b643afaf7e7ad2ccf4930dc35
Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master
ChangeLog
nptl/ChangeLog
nptl/nptl-init.c
sysdeps/posix/getaddrinfo.c