Merge branch 'master' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Tue, 11 May 2010 16:59:21 +0000 (18:59 +0200)
committerPatrick McHardy <kaber@trash.net>
Tue, 11 May 2010 16:59:21 +0000 (18:59 +0200)

Trivial merge