Merge branch 'klibc/1.15-dev'
authorAlexey Gladkov <legion@altlinux.org>
Mon, 8 Jun 2009 11:26:22 +0000 (15:26 +0400)
committerAlexey Gladkov <legion@altlinux.org>
Mon, 8 Jun 2009 11:26:22 +0000 (15:26 +0400)
commitb9ce252acae2d3f40cc776ddf320a944885e4f68
tree570319a8da54520563f7a87989b9f523f90a8abe
parent352b07b1876d3ce7271fb1b85eb74da9191c0127
parent7016330cd29b36e50e7029badfc191ab84881f48
Merge branch 'klibc/1.15-dev'

Conflicts:
src/loadkeys.c
src/dumpkeys.c
src/loadkeys.c
src/loadkeys.y