--- a/mercurial/templatefilters.py	Tue Oct 16 16:56:14 2012 +0200
+++ b/mercurial/templatefilters.py	Mon Oct 15 09:43:34 2012 -0700
@@ -92,9 +92,9 @@
 
 def escape(text):
     """:escape: Any text. Replaces the special XML/XHTML characters "&", "<"
-    and ">" with XML entities.
+    and ">" with XML entities, and filters out NUL characters.
     """
-    return cgi.escape(text, True)
+    return cgi.escape(text.replace('\0', ''), True)
 
 para_re = None
 space_re = None