Merged revisions 68205-68206 via svnmerge from

Merged revisions 68205-68206 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r68205 | antoine.pitrou | 2009-01-03 19:41:49 +0100 (sam., 03 janv. 2009) | 4 lines

  Issue #4718: Adapt the wsgiref package so that it actually works with Python 3.x,
  in accordance with http://www.wsgi.org/wsgi/Amendments_1.0
........
  r68206 | antoine.pitrou | 2009-01-03 19:49:41 +0100 (sam., 03 janv. 2009) | 3 lines

  Actually make test_wsgiref independent from the Python version.
........