Merging releases/1.6@4459:4490

svn merge --accept=postpone -r4459:4490 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .

Also:
- Added a checkstyle for OOPHM.
- Resolved Pruner merge issue with TODOs for spoon



git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@4491 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/build.xml b/dev/core/build.xml
index 2ca8b9a..b13b66d 100755
--- a/dev/core/build.xml
+++ b/dev/core/build.xml
@@ -45,6 +45,7 @@
       <zipfileset src="${gwt.tools.lib}/tomcat/naming-factory-1.0.jar" />
       <zipfileset src="${gwt.tools.lib}/tomcat/naming-java-1.0.jar" />
       <zipfileset src="${gwt.tools.lib}/tomcat/naming-resources-1.0.jar" />
+      <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar" />
       <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
       <zipfileset src="${gwt.tools.lib}/tomcat/servlets-common-1.0.jar" />
       <zipfileset src="${gwt.tools.lib}/tomcat/servlets-default-1.0.jar" />