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

........
  r75482 | ronald.oussoren | 2009-10-18 09:07:00 +0200 (Sun, 18 Oct 2009) | 3 lines

  Fix for issue 7149: a regression in 2.6.3 that causes an exception when
  trying to detect proxy settings on OSX.
........
2 files changed