Merge branch 'r0ml' of github.com:sourcewave/pljava into r0ml

Conflicts:
	src/C/pljava/Makefile
	src/C/pljava/init_jni.c