re-unite darwinsys JGrep and javasrc Grep2

