Merged revisions 78818 via svnmerge from

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

................
  r78818 | benjamin.peterson | 2010-03-09 15:46:49 -0600 (Tue, 09 Mar 2010) | 9 lines

  Merged revisions 78817 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78817 | benjamin.peterson | 2010-03-09 15:43:36 -0600 (Tue, 09 Mar 2010) | 1 line

    handle an empty OPT variable correctly #8100
  ........
................

git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@78825 6015fed2-1504-0410-9fe1-9d1591cc4771