Merge branch 'master' of /repos/git/net-next-2.6
authorPatrick McHardy <kaber@trash.net>
Thu, 16 Jun 2011 15:01:10 +0000 (17:01 +0200)
committerPatrick McHardy <kaber@trash.net>
Thu, 16 Jun 2011 15:01:10 +0000 (17:01 +0200)

Trivial merge