Merge remote-tracking branch 'origin/kernel-update' into glibc-update2
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Aug 2012 12:49:24 +0000 (14:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Aug 2012 12:49:24 +0000 (14:49 +0200)

Trivial merge