Two files are missing from the plug-in workspaces that causes the Merlin nightly build to be broken:

1) ext/plugin/build/win32/include/makefile - this should include generation of sun_plugin_JavaRunTime.h

2) ext/plugin/jpishare/src/win32/hotjava.ico - this file is missing from the putback.