Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 8859)
+++ tools/gformat.py	(revision 8860)
@@ -35,5 +35,5 @@
   
 
-NODE_DIR = os.getcwd()
+NODE_DIR = os.getcwd() + '/../nodes'
 __version__ = '$Id$'
 
@@ -706,5 +706,8 @@
       
       print "serving at port", PORT
-      httpd.serve_forever()
+      try:
+        httpd.serve_forever()
+      except KeyboardInterrupt:
+        httpd.shutdown()
     elif sys.argv[1] == "test":
       os.environ['PATH_INFO'] = "/".join(sys.argv[2:])