Merge branch 'master' of git://dev.medozas.de/linux
authorPatrick McHardy <kaber@trash.net>
Tue, 2 Jun 2009 11:44:56 +0000 (13:44 +0200)
committerPatrick McHardy <kaber@trash.net>
Tue, 2 Jun 2009 11:44:56 +0000 (13:44 +0200)

Trivial merge