Applying the servlet fixes from r840 (on the snapshot) to trunk.

git-svn-id: https://google-guice.googlecode.com/svn/trunk@944 d779f126-a31b-0410-b53b-1d3aecad763e
2 files changed