diff -r d351a3be3371 -r 8238a3f039e6 mercurial/commands.py
--- a/mercurial/commands.py	Fri Jun 02 08:05:01 2006 -0700
+++ b/mercurial/commands.py	Fri Jun 02 08:25:02 2006 -0700
@@ -13,8 +13,7 @@
 demandload(globals(), "fnmatch mdiff random signal tempfile time")
 demandload(globals(), "traceback errno socket version struct atexit sets bz2")
 demandload(globals(), "archival changegroup")
-demandload(globals(), "mercurial.hgweb.server:create_server")
-demandload(globals(), "mercurial.hgweb:hgweb,hgwebdir")
+demandload(globals(), "hgweb.server")
 
 class UnknownCommand(Exception):
     """Exception raised if command is not in the command table."""
@@ -2544,7 +2543,7 @@
         os._exit(0)
 
     try:
-        httpd = create_server(ui, repo, hgwebdir, hgweb)
+        httpd = hgweb.server.create_server(ui, repo)
     except socket.error, inst:
         raise util.Abort(_('cannot start server: ') + inst.args[1])