Merged revisions 74356-74357 via svnmerge from
commite4a5b92ab40b119d6816c10944f1679bfe4d4be0
authorbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Wed, 12 Aug 2009 18:39:44 +0000 (12 18:39 +0000)
committerbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Wed, 12 Aug 2009 18:39:44 +0000 (12 18:39 +0000)
treead1945182752f252bcb4c74650a7e435df784822
parent9f058b8c5230d4127ac03f2ff8567aa3f49eca7c
Merged revisions 74356-74357 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74356 | benjamin.peterson | 2009-08-12 13:11:03 -0500 (Wed, 12 Aug 2009) | 1 line

  fix typo in c++ ifdef
........
  r74357 | benjamin.peterson | 2009-08-12 13:18:03 -0500 (Wed, 12 Aug 2009) | 1 line

  search through db.h in binary #6680
........

git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74358 6015fed2-1504-0410-9fe1-9d1591cc4771
Modules/socketmodule.h
setup.py