Merge branch 'master' of http://kernel.org/pub/scm/linux/storage/multipath-tools/
authorChristophe Varoqui <root@xa-s05.(none)>
Sun, 15 Jan 2006 16:16:00 +0000 (17:16 +0100)
committerChristophe Varoqui <root@xa-s05.(none)>
Sun, 15 Jan 2006 16:16:00 +0000 (17:16 +0100)

Trivial merge