Merged revisions 84089 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84089 | giampaolo.rodola | 2010-08-16 07:08:11 +0200 (lun, 16 ago 2010) | 1 line

  fix getaddrinfo test failure on OSX caused by AI_CANNAME erroneously used as the value for 'proto'
........