Merge branch 'master' of /repos/git/net-2.6
authorPatrick McHardy <kaber@trash.net>
Wed, 18 Feb 2009 14:16:18 +0000 (15:16 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 18 Feb 2009 14:16:18 +0000 (15:16 +0100)

Trivial merge