tree 1a24b77cef873fa16bf108a7764b69c6a8c7211a
parent b136a9c9d718e6cc717aef45daec9e8b28423b06
author Ronald Oussoren <ronaldoussoren@mac.com> 1271623774 +0000
committer Ronald Oussoren <ronaldoussoren@mac.com> 1271623774 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release31-maint%4080199

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

........
  r80198 | ronald.oussoren | 2010-04-18 22:46:11 +0200 (Sun, 18 Apr 2010) | 4 lines

  For for issue #7154: Port the code that uses
  the SystemConfiguration framework to detect the
  proxy settings on OSX from the trunk to python 3.2
........