Recording historical merges from trunk.


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