408529 Etags set in 304 response
408642 setContentType from addHeader
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
fixed merge
409012 added reference to example rewrite rules