--- a/mercurial/mail.py	Tue Dec 12 18:16:23 2006 -0600
+++ b/mercurial/mail.py	Wed Dec 13 13:27:09 2006 -0600
@@ -6,8 +6,7 @@
 # of the GNU General Public License, incorporated herein by reference.
 
 from i18n import gettext as _
-from demandload import *
-demandload(globals(), "os re smtplib templater util")
+import os, re, smtplib, templater, util
 
 def _smtp(ui):
     '''send mail using smtp.'''