merge to jetty-8
merge to jetty-8

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags/jetty-7-to-jetty-8-base-20110408@2995 7e9141cc-0065-0410-87d8-b60c137991c4