Index: views/debug.py
===================================================================
--- views/debug.py      (revision 1406)
+++ views/debug.py      (working copy)
@@ -12,7 +12,7 @@
     yield 0
     p = template_source.find('\n')
     while p >= 0:
-        yield p
+        yield p+1
         p = template_source.find('\n', p+1)
     yield len(template_source) + 1
 
@@ -23,14 +23,13 @@
     line = 0
     upto = 0
     source_lines = []
-    linebreaks = izip(count(0), linebreak_iter(template_source))
-    for num, next in linebreaks:
+    for num, next in enumerate(linebreak_iter(template_source)):
         if start >= upto and end <= next:
             line = num
-            before = escape(template_source[upto+1:start])
+            before = escape(template_source[upto:start])
             during = escape(template_source[start:end])
             after = escape(template_source[end:next])
-        source_lines.append( (num, escape(template_source[upto+1:next])) )
+        source_lines.append( (num, escape(template_source[upto:next])) )
         upto = next
     total = len(source_lines)