Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
Patrick McHardy [Thu, 16 Jun 2011 15:09:54 +0000 (17:09 +0200)]

Trivial merge