Index: django/conf/global_settings.py
===================================================================
--- django/conf/global_settings.py	(revision 9532)
+++ django/conf/global_settings.py	(working copy)
@@ -142,6 +142,9 @@
 EMAIL_HOST_PASSWORD = ''
 EMAIL_USE_TLS = False
 
+# Whether to use a multi-threaded development server.
+USE_MULTITHREADED_SERVER = False
+
 # List of strings representing installed apps.
 INSTALLED_APPS = ()
 
Index: django/core/servers/basehttp.py
===================================================================
--- django/core/servers/basehttp.py	(revision 9532)
+++ django/core/servers/basehttp.py	(working copy)
@@ -7,7 +7,7 @@
 been reviewed for security issues. Don't use it for production use.
 """
 
-from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+from BaseHTTPServer import BaseHTTPRequestHandler
 import mimetypes
 import os
 import re
@@ -15,6 +15,16 @@
 import sys
 import urllib
 
+from django.conf import settings
+if settings.USE_MULTITHREADED_SERVER:
+    # This creates a base HTTPServer class that supports multithreading
+    import BaseHTTPServer, SocketServer
+    class HTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
+        def __init__(self, server_address, RequestHandlerClass=None):
+            BaseHTTPServer.HTTPServer.__init__(self, server_address, RequestHandlerClass)
+else:
+    from BaseHTTPServer import HTTPServer
+
 from django.utils.http import http_date
 
 __version__ = "0.1"
Index: docs/ref/settings.txt
===================================================================
--- docs/ref/settings.txt	(revision 9532)
+++ docs/ref/settings.txt	(working copy)
@@ -1203,6 +1203,17 @@
 
 .. setting:: YEAR_MONTH_FORMAT
 
+USE_MULTITHREADED_SERVER
+------------------------
+
+**New in Django development version**
+
+Default: ``False``
+
+A boolean that specifies whether Django's built-in development server
+should run multi-threaded.  Caution should be taken when setting this to
+True so as to avoid multi-threading bugs in your views.
+
 YEAR_MONTH_FORMAT
 -----------------