Merged revisions 77972 via svnmerge from

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

................
  r77972 | antoine.pitrou | 2010-02-04 21:23:24 +0100 (jeu., 04 févr. 2010) | 12 lines

  Merged revisions 77970 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77970 | antoine.pitrou | 2010-02-04 21:20:18 +0100 (jeu., 04 févr. 2010) | 6 lines

    Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is
    specified, rather than fall through to AF_PACKET (in the `socket` module).
    Also, raise ValueError rather than TypeError when an unknown TIPC address
    type is specified.  Patch by Brian Curtin.
  ........
................