Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Aug 2012 20:05:14 +0000 (22:05 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Aug 2012 20:05:14 +0000 (22:05 +0200)

Trivial merge