diff -r 87ebf72878ed -r e4bfb9c337f3 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Sat Apr 30 07:30:38 2011 -0500
+++ b/mercurial/cmdutil.py	Sat Apr 30 13:59:14 2011 +0200
@@ -8,7 +8,7 @@
 from node import hex, nullid, nullrev, short
 from i18n import _
 import os, sys, errno, re, glob, tempfile
-import util, scmutil, templater, patch, error, encoding, templatekw
+import util, scmutil, templater, patch, error, templatekw
 import match as matchmod
 import similar, revset, subrepo