Merge git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-2.6 into lvs-next-2.6
authorSimon Horman <horms@verge.net.au>
Wed, 17 Sep 2008 00:08:26 +0000 (10:08 +1000)
committerSimon Horman <horms@verge.net.au>
Wed, 17 Sep 2008 00:08:26 +0000 (10:08 +1000)

Trivial merge