Merge branch 'collectd-4.10'

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

Sun, 13 Jun 2010 19:44:21 +0000 (21:44 +0200)

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

Sun, 13 Jun 2010 19:44:21 +0000 (21:44 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 19:44:21 +0000 (21:44 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 19:44:21 +0000 (21:44 +0200)
diff --cc configure.in
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sun, 13 Jun 2010 19:44:21 +0000 (21:44 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sun, 13 Jun 2010 19:44:21 +0000 (21:44 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history