Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Mon, 9 May 2011 13:01:52 +0000 (09:01 -0400)
committerUlrich Drepper <drepper@gmail.com>
Mon, 9 May 2011 13:01:52 +0000 (09:01 -0400)
commit0f7843d00f0703837f380eb03143a4ed5d485ead
tree4946d0f4f81206f79cb49496a2f4821dd4b92222
parent445d72ca267e2f4815847c3ad2bc108952049444
parent0e8131bb32cf026c87baeacb7abf2a9bdbbc4953
Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
localedata/ChangeLog
localedata/ChangeLog
localedata/SUPPORTED