Merge branch 'glibc-upgrade'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 16 Mar 2010 21:24:31 +0000 (22:24 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 16 Mar 2010 21:24:31 +0000 (22:24 +0100)

Trivial merge