[Python-checkins] r75109 - python/branches/py3k

[mark.dickinson]

Author: mark.dickinson
Date: Mon Sep 28 18:07:15 2009
New Revision: 75109

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)