Merge branch 'collectd-4.10'

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

Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)

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

Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/configfile.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/configfile.c	patch \|	diff1 \|	diff2 \|	blob \| history