Merge branch 'devel-3.0' into sles11

author NeilBrown <neilb@suse.de>

Fri, 14 Nov 2008 04:20:29 +0000 (15:20 +1100)

committer NeilBrown <neilb@suse.de>

Fri, 14 Nov 2008 04:20:29 +0000 (15:20 +1100)
author NeilBrown <neilb@suse.de>
Fri, 14 Nov 2008 04:20:29 +0000 (15:20 +1100)
committer NeilBrown <neilb@suse.de>
Fri, 14 Nov 2008 04:20:29 +0000 (15:20 +1100)
diff --cc Manage.c
Simple merge
diff --cc util.c
Simple merge
author	NeilBrown <neilb@suse.de>
	Fri, 14 Nov 2008 04:20:29 +0000 (15:20 +1100)
committer	NeilBrown <neilb@suse.de>
	Fri, 14 Nov 2008 04:20:29 +0000 (15:20 +1100)
		1	2
Manage.c	patch \|	diff1 \|	diff2 \|	blob \| history
util.c	patch \|	diff1 \|	diff2 \|	blob \| history