Merge branch 'master' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Wed, 10 Feb 2010 16:56:46 +0000 (17:56 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 10 Feb 2010 16:56:46 +0000 (17:56 +0100)

Trivial merge