Merge branch 'collectd-4.6'

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

Sat, 14 Mar 2009 17:52:38 +0000 (18:52 +0100)

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

Sat, 14 Mar 2009 17:52:38 +0000 (18:52 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:38 +0000 (18:52 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:38 +0000 (18:52 +0100)
diff --cc src/bind.c
Simple merge
diff --cc src/common.c
Simple merge
diff --cc src/types.db
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 14 Mar 2009 17:52:38 +0000 (18:52 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 14 Mar 2009 17:52:38 +0000 (18:52 +0100)
		1	2
src/bind.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history