Merge branch 'master' of ssh://sources.redhat.com/git/glibc
authorUlrich Drepper <drepper@redhat.com>
Mon, 24 Aug 2009 03:43:53 +0000 (20:43 -0700)
committerUlrich Drepper <drepper@redhat.com>
Mon, 24 Aug 2009 03:43:53 +0000 (20:43 -0700)

Trivial merge