Merge branch 'master' into devel-3.1

author NeilBrown <neilb@suse.de>

Thu, 22 Oct 2009 02:57:54 +0000 (13:57 +1100)

committer NeilBrown <neilb@suse.de>

Thu, 22 Oct 2009 02:57:54 +0000 (13:57 +1100)
author NeilBrown <neilb@suse.de>
Thu, 22 Oct 2009 02:57:54 +0000 (13:57 +1100)
committer NeilBrown <neilb@suse.de>
Thu, 22 Oct 2009 02:57:54 +0000 (13:57 +1100)
diff --cc ReadMe.c
Simple merge
diff --cc mdadm.8
Simple merge
author	NeilBrown <neilb@suse.de>
	Thu, 22 Oct 2009 02:57:54 +0000 (13:57 +1100)
committer	NeilBrown <neilb@suse.de>
	Thu, 22 Oct 2009 02:57:54 +0000 (13:57 +1100)
		1	2
ReadMe.c	patch \|	diff1 \|	diff2 \|	blob \| history
mdadm.8	patch \|	diff1 \|	diff2 \|	blob \| history