Merged revisions 74056 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

(Selected changes.)

................
  r74056 | alexandre.vassalotti | 2009-07-17 11:34:31 +0200 (Fr, 17 Jul 2009) | 34 lines

  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
  ........
    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
  ........
................
diff --git a/Misc/NEWS b/Misc/NEWS
index 2b7fe80..fa26209 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -179,7 +179,7 @@
 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
 -------