merge from 2.5 branch.

diff --cc Lib/SimpleHTTPServer.py
index 0110da018184b7c102f5f5582d39a3a079e9c990,286731d354952a6da25de9df29d21812c94b15cf..3e0334da3b3fb312fe18e00a483ea216095b151d
--- 1/Lib/SimpleHTTPServer.py
--- 2/Lib/SimpleHTTPServer.py
+++ b/Lib/SimpleHTTPServer.py
@@@ -14,7 -14,9 +14,8 @@@ import o
  import posixpath
  import BaseHTTPServer
  import urllib
 -import urlparse
  import cgi
+ import sys
  import shutil
  import mimetypes
  try: