Merge branch 'master' into ff/java

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

Tue, 24 Feb 2009 09:16:19 +0000 (10:16 +0100)

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

Tue, 24 Feb 2009 09:16:19 +0000 (10:16 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 24 Feb 2009 09:16:19 +0000 (10:16 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 24 Feb 2009 09:16:19 +0000 (10:16 +0100)
diff --cc src/perl.c
Simple merge
diff --cc src/plugin.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 24 Feb 2009 09:16:19 +0000 (10:16 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 24 Feb 2009 09:16:19 +0000 (10:16 +0100)
		1	2
src/perl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history