Merge branch 'master' of git://git.kernel.org/pub/scm/linux/storage/multipath-tools/
authorHannes Reinecke <hare@suse.de>
Tue, 20 Jul 2010 07:19:03 +0000 (09:19 +0200)
committerHannes Reinecke <hare@suse.de>
Tue, 20 Jul 2010 07:19:03 +0000 (09:19 +0200)

Trivial merge