Clean up merge info

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

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