Merge branch 'collectd-4.10'

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

Mon, 6 Dec 2010 08:31:34 +0000 (09:31 +0100)

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

Mon, 6 Dec 2010 08:31:34 +0000 (09:31 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 6 Dec 2010 08:31:34 +0000 (09:31 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 6 Dec 2010 08:31:34 +0000 (09:31 +0100)
diff --cc configure.in
Simple merge
diff --cc src/common.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 6 Dec 2010 08:31:34 +0000 (09:31 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 6 Dec 2010 08:31:34 +0000 (09:31 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/common.c	patch \|	diff1 \|	diff2 \|	blob \| history