Merge branch 'master' of /repos/git/net-next-2.6
authorPatrick McHardy <kaber@trash.net>
Wed, 19 Jan 2011 22:51:37 +0000 (23:51 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 19 Jan 2011 22:51:37 +0000 (23:51 +0100)

Trivial merge