Import tomcat6 version 0.5.4