Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Aug 2012 19:25:14 +0000 (15:25 -0400)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Aug 2012 19:25:14 +0000 (15:25 -0400)

Trivial merge