Merge branch 'master' of /repos/git/net-next-2.6
authorPatrick McHardy <kaber@trash.net>
Wed, 10 Feb 2010 13:17:10 +0000 (14:17 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 10 Feb 2010 13:17:10 +0000 (14:17 +0100)
Signed-off-by: Patrick McHardy <kaber@trash.net>

Trivial merge