From: Mark Dickinson <dickinsm@gmail.com>
Date: Mon, 28 Sep 2009 16:07:15 +0000 (+0000)
Subject: Recorded merge of revisions 75054 via svnmerge from
X-Git-Tag: v3.2a1~2477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c976a0437a0011fda71e8eac18c1854bd8fdb64;p=python

Recorded merge of revisions 75054 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75054 | kristjan.jonsson | 2009-09-25 16:19:51 +0100 (Fri, 25 Sep 2009) | 2 lines

  http://bugs.python.org/issue6971
  Adding the SIO_KEEPALIVE_VALS command to socket.ioctl on windows
........
---