vote

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1590159 13f79535-47bb-0310-9956-ffa450edef68
Propose combined patch

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1590163 13f79535-47bb-0310-9956-ffa450edef68