Merge branch 'master' of ssh://sourceware.org/git/glibc
authorSteve Ellcey <sellcey@mips.com>
Mon, 29 Oct 2012 18:41:36 +0000 (11:41 -0700)
committerSteve Ellcey <sellcey@mips.com>
Mon, 29 Oct 2012 18:41:36 +0000 (11:41 -0700)

Trivial merge