Merged revisions 73985-73986,73988-73991,73994 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73985 | benjamin.peterson | 2009-07-12 17:18:55 -0400 (Sun, 12 Jul 2009) | 1 line

  add Joe
........
  r73986 | kristjan.jonsson | 2009-07-12 18:42:08 -0400 (Sun, 12 Jul 2009) | 2 lines

  http://bugs.python.org/issue6267
  Add more tests for the xlmrpc.ServerProxy
........
  r73988 | benjamin.peterson | 2009-07-12 19:40:33 -0400 (Sun, 12 Jul 2009) | 1 line

  fix Tarek's name
........
  r73989 | benjamin.peterson | 2009-07-12 19:44:43 -0400 (Sun, 12 Jul 2009) | 1 line

  change encoding to utf-8
........
  r73990 | benjamin.peterson | 2009-07-12 19:49:23 -0400 (Sun, 12 Jul 2009) | 1 line

  fix another name
........
  r73991 | benjamin.peterson | 2009-07-12 19:56:18 -0400 (Sun, 12 Jul 2009) | 1 line

  change encoding to utf-8
........
  r73994 | benjamin.peterson | 2009-07-12 20:03:20 -0400 (Sun, 12 Jul 2009) | 1 line

  fix umlaut
........
2 files changed