Merged revisions 68036 via svnmerge from

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

................
  r68036 | tarek.ziade | 2008-12-29 23:38:38 +0100 (Mon, 29 Dec 2008) | 9 lines

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

  ........
    r68033 | tarek.ziade | 2008-12-29 23:23:53 +0100 (Mon, 29 Dec 2008) | 1 line

    fixed #4646 : distutils was choking on empty options arg in the setup function.
  ........
................