Revert "clea"

This reverts commit e477760edd9b8ded432f08fc62a58e576c788e07.

Conflicts:
	java/Makefile.am
merge
makefile & help