update those manually, since cvs got confused.
re-add java parser. It's a re-entrant parser, so yacc doesn't compete sofar.