From b82cbc33f5f7997b181278f2ef20691e11099d2b Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Tue, 1 Nov 2011 23:54:16 +0100
Subject: [PATCH] Fix merge in changeset e1dde980a92c.

---
 Lib/test/test_xml_etree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 1b66a8988f4..f1a774ae94d 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -738,8 +738,8 @@ def iterparse():
     ...     print action, elem.tag
     ... except ET.ParseError, v:
     ...   print v
-    junk after document element: line 1, column 12
     end document
+    junk after document element: line 1, column 12
     """
 
 def writefile():