Merge branch 'master' of ssh://sources.redhat.com/git/glibc
commit46658a1cbccb564942a147a747a7579099773764
authorUlrich Drepper <drepper@redhat.com>
Mon, 14 Jun 2010 21:48:37 +0000 (14 14:48 -0700)
committerUlrich Drepper <drepper@redhat.com>
Mon, 14 Jun 2010 21:48:37 +0000 (14 14:48 -0700)
tree2ebe1e567b66dcd9e126b89c236117d1f15eaa7c
parentb2ef2c014b9c66995a3eb4f310ae7c5c510279bf
parentfbd643b66230bafead971b8cd3b0cfe70f5d22ce
Merge branch 'master' of ssh://sources.redhat.com/git/glibc

Conflicts:
ChangeLog
ChangeLog