Merge branch 'master' into ff/java

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

Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)

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

Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/perl.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/perl.c	patch \|	diff1 \|	diff2 \|	blob \| history