Merge branch 'collectd-4.0'

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

Tue, 19 Jun 2007 19:43:42 +0000 (21:43 +0200)

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

Tue, 19 Jun 2007 19:43:42 +0000 (21:43 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 19 Jun 2007 19:43:42 +0000 (21:43 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 19 Jun 2007 19:43:42 +0000 (21:43 +0200)
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/rrdtool.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 19 Jun 2007 19:43:42 +0000 (21:43 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 19 Jun 2007 19:43:42 +0000 (21:43 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/rrdtool.c	patch \|	diff1 \|	diff2 \|	blob \| history