Merge branch 'master' into devel-3.2

author NeilBrown <neilb@suse.de>

Mon, 14 Mar 2011 07:49:57 +0000 (18:49 +1100)

committer NeilBrown <neilb@suse.de>

Mon, 14 Mar 2011 07:49:57 +0000 (18:49 +1100)
author NeilBrown <neilb@suse.de>
Mon, 14 Mar 2011 07:49:57 +0000 (18:49 +1100)
committer NeilBrown <neilb@suse.de>
Mon, 14 Mar 2011 07:49:57 +0000 (18:49 +1100)
diff --cc monitor.c
Simple merge
diff --cc super-ddf.c
Simple merge
author	NeilBrown <neilb@suse.de>
	Mon, 14 Mar 2011 07:49:57 +0000 (18:49 +1100)
committer	NeilBrown <neilb@suse.de>
	Mon, 14 Mar 2011 07:49:57 +0000 (18:49 +1100)
		1	2
monitor.c	patch \|	diff1 \|	diff2 \|	blob \| history
super-ddf.c	patch \|	diff1 \|	diff2 \|	blob \| history