most recent changes, diff for tomcat5