--- a/web/request.py	Mon Jul 27 10:58:37 2009 +0200
+++ b/web/request.py	Tue Jul 21 19:40:10 2009 +0200
@@ -709,7 +709,7 @@
         return True
 
     def html_content_type(self):
-        if self.xhtml_browser():
+        if not self.vreg.config['force-html-content-type'] and self.xhtml_browser():
             return 'application/xhtml+xml'
         return 'text/html'