Add Jeremy's patch.
These changes were overwritten by a subsequent commit, but they may be needed to make a clean svn merge.

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