Merge branch 'collectd-4.10'

author Florian Forster <octo@leeloo.lan.home.verplant.org>

Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)

committer Florian Forster <octo@leeloo.lan.home.verplant.org>

Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)
diff --cc configure.in
Simple merge
diff --cc src/df.c
Simple merge
diff --cc src/swap.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/df.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/swap.c	patch \|	diff1 \|	diff2 \|	blob \| history