[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.21-1-2-gd99aff3

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit d99aff310b37653277fef6bd7c6bcf34663694c9
Merge: 6abc0dd51a8725cc98c3fd85b811792cbea8c433 761f73ee75ab7852e2194fe111567fea425007ba
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Tue Oct 4 18:37:57 2011 -0430

    Merge branch 'upstream'


-- 
tomcat7: Servlet and JSP engine