Merge branch 'master' of git://git.kernel.org/pub/scm/linux/storage/multipath-tools/
authorHannes Reinecke <hare@suse.de>
Tue, 30 Nov 2010 07:29:13 +0000 (08:29 +0100)
committerHannes Reinecke <hare@suse.de>
Tue, 30 Nov 2010 07:29:13 +0000 (08:29 +0100)

Trivial merge