Merge branch 'collectd-4.6'

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

Sat, 11 Apr 2009 07:37:30 +0000 (09:37 +0200)

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

Sat, 11 Apr 2009 07:37:30 +0000 (09:37 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 11 Apr 2009 07:37:30 +0000 (09:37 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 11 Apr 2009 07:37:30 +0000 (09:37 +0200)
diff --cc configure.in
Simple merge
diff --cc src/exec.c
Simple merge
diff --cc src/network.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 11 Apr 2009 07:37:30 +0000 (09:37 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 11 Apr 2009 07:37:30 +0000 (09:37 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/exec.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network.c	patch \|	diff1 \|	diff2 \|	blob \| history