Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-2.6 into lvs-next-2.6

This commit is contained in:
Simon Horman 2008-08-27 15:11:37 +10:00
commit 7fd1067851
17 changed files with 1488 additions and 713 deletions