Merge branch 'collectd-4.3'

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

Thu, 28 Feb 2008 22:06:26 +0000 (23:06 +0100)

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

Thu, 28 Feb 2008 22:06:26 +0000 (23:06 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 28 Feb 2008 22:06:26 +0000 (23:06 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 28 Feb 2008 22:06:26 +0000 (23:06 +0100)
diff --cc configure.in
Simple merge
diff --cc src/network.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Thu, 28 Feb 2008 22:06:26 +0000 (23:06 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Thu, 28 Feb 2008 22:06:26 +0000 (23:06 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/network.c	patch \|	diff1 \|	diff2 \|	blob \| history