Merge branch 'master' of git://sourceware.org/git/glibc-ports
authorChris Metcalf <cmetcalf@tilera.com>
Mon, 14 May 2012 20:13:02 +0000 (16:13 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Mon, 14 May 2012 20:13:02 +0000 (16:13 -0400)

Trivial merge