Merge branch 'collectd-4.6'

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

Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)

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

Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
diff --cc configure.in
Simple merge
diff --cc src/collectd.conf.in
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history