Merge branch 'collectd-4.6' into collectd-4.7

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

Sat, 9 May 2009 10:39:12 +0000 (12:39 +0200)

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

Sat, 9 May 2009 10:39:12 +0000 (12:39 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 May 2009 10:39:12 +0000 (12:39 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 May 2009 10:39:12 +0000 (12:39 +0200)
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 9 May 2009 10:39:12 +0000 (12:39 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 9 May 2009 10:39:12 +0000 (12:39 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history