[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.39-1-3-g34eaec6

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 883894923829287856557ba50a219777c89764ee
Merge: 9665d6945da6af6afa261d94783604bd5e70e636 89fdd053b2a249703408f69f940168ba6c508842
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Fri May 10 19:33:07 2013 -0300

    Merge branch 'upstream'


-- 
tomcat7: Servlet and JSP engine