Merge branch 'collectd-4.9' into collectd-4.10

author Florian Forster <octo@huhu.verplant.org>

Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)

committer Florian Forster <octo@huhu.verplant.org>

Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)
author Florian Forster <octo@huhu.verplant.org>
Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)
committer Florian Forster <octo@huhu.verplant.org>
Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)
diff --cc configure.in
Simple merge
diff --cc src/java.c
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)
committer	Florian Forster <octo@huhu.verplant.org>
	Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/java.c	patch \|	diff1 \|	diff2 \|	blob \| history