Merge branch 'master' of git://sourceware.org/git/glibc
authorAndreas Jaeger <aj@suse.de>
Mon, 9 Apr 2012 19:25:13 +0000 (21:25 +0200)
committerAndreas Jaeger <aj@suse.de>
Mon, 9 Apr 2012 19:25:13 +0000 (21:25 +0200)
commit8a1fbaaf75536088b4d505409e0e87975d8cf8d5
tree1df51c8e1660d2ffdce8bf9ff75184e9affcc165
parent03879793292b70f4c3ca64259e80a2b44787e865
parent8de131cbff365a34392ee3314ee5ea8007a877fe
Merge branch 'master' of git://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog