Merge branch 'collectd-4.5' into collectd-4.6

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

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

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

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