trying to find my changes

Conflicts:

	vm/agate/AgateJni.cpp
	vm/interp/Taint.h
found my changes