Merge branch 'master' of git://sourceware.org/git/glibc
commit96bd03c79a7ea9bdf6130e4a641d3144cbefabac
authorAndreas Jaeger <aj@suse.de>
Sun, 8 Apr 2012 12:54:13 +0000 (8 14:54 +0200)
committerAndreas Jaeger <aj@suse.de>
Sun, 8 Apr 2012 12:54:13 +0000 (8 14:54 +0200)
tree231823641c4af12142be32d0dcc1103fa6d206ef
parent624254b18ae5a756baabbcd881faf1440e36151f
parent1e4920e0808439be5e4a6a6e8a736de32c43b070
Merge branch 'master' of git://sourceware.org/git/glibc

Conflicts:
ChangeLog
ChangeLog