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, 26 insertions, 25 deletions

diff --git a/Misc/ACKS b/Misc/ACKS
index 179a279..58f5054 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -7,7 +7,7 @@ Without you, I would've stopped working on Python long ago!
 
 	--Guido
 
-PS: In the standard Python distribution, this file is encoded in Latin-1.
+PS: In the standard Python distribution, this file is encoded in UTF-8.
 
 David Abrahams
 Jim Ahlstrom
@@ -15,10 +15,11 @@ Farhan Ahmad
 Jyrki Alakuijala
 Billy G. Allie
 Kevin Altis
+Joe Amenta
 Mark Anacker
 Anders Andersen
 John Anderson
-Erik Andersén
+Erik Andersén
 Oliver Andrich
 Ross Andrus
 Jason Asbahr
@@ -193,7 +194,7 @@ Gary Duzan
 Eugene Dvurechenski
 Josip Dzolonga
 Maxim Dzumanenko
-Walter Dörwald
+Walter Dörwald
 Hans Eckardt
 Grant Edwards
 John Ehresman
@@ -204,7 +205,7 @@ David Ely
 Jeff Epler
 Tom Epperly
 Stoffel Erasmus
-Jürgen A. Erhard
+Jürgen A. Erhard
 Michael Ernst
 Ben Escoto
 Andy Eskilsson
@@ -227,7 +228,7 @@ Russell Finn
 Nils Fischbeck
 Frederik Fix
 Matt Fleming
-Hernán Martínez Foffani
+Hernán Martínez Foffani
 Michael Foord
 Amaury Forgeot d'Arc
 Doug Fort
@@ -241,7 +242,7 @@ Gyro Funch
 Peter Funk
 Geoff Furnish
 Ulisses Furquim
-Hagen Fürstenau
+Hagen Fürstenau
 Achim Gaedke
 Martin von Gagern
 Lele Gaifax
@@ -273,13 +274,13 @@ Eddy De Greef
 Duncan Grisby
 Dag Gruneau
 Michael Guravage
-Lars Gustäbel
-Thomas Güttler
+Lars Gustäbel
+Thomas Güttler
 Barry Haddow
 Paul ten Hagen
 Rasmus Hahn
 Peter Haight
-Václav Haisman
+Václav Haisman
 Bob Halley
 Jesse Hallio
 Jun Hamano
@@ -303,7 +304,7 @@ Jonathan Hendry
 James Henstridge
 Chris Herborth
 Ivan Herman
-Jürgen Hermann
+Jürgen Hermann
 Gary Herron
 Thomas Herve
 Bernhard Herzog
@@ -340,7 +341,7 @@ Jim Hugunin
 Greg Humphreys
 Eric Huss
 Jeremy Hylton
-Gerhard Häring
+Gerhard Häring
 Mihai Ibanescu
 Lars Immisch
 Tony Ingraldi
@@ -356,7 +357,7 @@ Geert Jansen
 Jack Jansen
 Bill Janssen
 Drew Jenkins
-Flemming Kjær Jensen
+Flemming Kjær Jensen
 Jiba
 Orjan Johansen
 Fredrik Johansson
@@ -454,7 +455,7 @@ Fredrik Lundh
 Mark Lutz
 Jim Lynch
 Mikael Lyngvig
-Martin von Löwis
+Martin von Löwis
 Andrew I MacIntyre
 Tim MacKenzie
 Nick Maclaren
@@ -467,7 +468,7 @@ David Marek
 Doug Marien
 Alex Martelli
 Anthony Martin
-Sébastien Martini
+Sébastien Martini
 Roger Masse
 Nick Mathewson
 Graham Matthews
@@ -514,7 +515,7 @@ Fredrik Nehr
 Trent Nelson
 Tony Nelson
 Chad Netzer
-Max Neunhöffer
+Max Neunhöffer
 George Neville-Neil
 Johannes Nicolai
 Samuel Nicolary
@@ -543,7 +544,7 @@ Russel Owen
 Ondrej Palkovsky
 Mike Pall
 Todd R. Palmer
-Juan David Ibáñez Palomar
+Juan David Ibáñez Palomar
 Jan Palus
 M. Papillon
 Peter Parente
@@ -554,7 +555,7 @@ Randy Pausch
 Samuele Pedroni
 Marcel van der Peijl
 Steven Pemberton
-Santiago Peresón
+Santiago Peresón
 Mark Perrego
 Trevor Perrin
 Tim Peters
@@ -569,11 +570,11 @@ Neale Pickett
 Jim St. Pierre
 Dan Pierson
 Martijn Pieters
-François Pinard
+François Pinard
 Zach Pincus
 Michael Piotrowski
 Antoine Pitrou
-Jean-François Piéronne
+Jean-François Piéronne
 Guilherme Polo
 Michael Pomraning
 Iustin Pop
@@ -582,8 +583,8 @@ Amrit Prem
 Paul Prescod
 Donovan Preston
 Steve Purcell
-Fernando Pérez
-Eduardo Pérez
+Fernando Pérez
+Eduardo Pérez
 Brian Quinlan
 Anders Qvist
 Burton Radons
@@ -740,7 +741,7 @@ Anthony Tuininga
 Stephen Turner
 Bill Tutt
 Doobee R. Tzeck
-Eren Türkay
+Eren Türkay
 Lionel Ulmer
 Roger Upole
 Michael Urman
@@ -817,5 +818,5 @@ Artur Zaprzala
 Mike Zarnstorff
 Siebren van der Zee
 Uwe Zessin
-Tarek ZiadŽ
-Peter Åstrand
+Tarek Ziadé
+Peter Ã…strand
diff --git a/Misc/NEWS b/Misc/NEWS
index 2b15812..1cc39f2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -138,7 +138,7 @@ Core and Builtins
   possible to update the lineno attribute of the current frame.
 
 - Issue #5330: C functions called with keyword arguments were not reported by
-  the various profiling modules (profile, cProfile). Patch by Hagen Fürstenau.
+  the various profiling modules (profile, cProfile). Patch by Hagen Fürstenau.
 
 Library
 -------