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

........
  r87394 | georg.brandl | 2010-12-19 02:10:32 -0800 (Sun, 19 Dec 2010) | 1 line

  #6075: make idle work with both Carbon AquaTk and Cocoa AquaTk. Patch by Kevin Walzer and Ned Deily.
........
diff --git a/Misc/ACKS b/Misc/ACKS
index e84040d..0c7debc 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -834,6 +834,7 @@
 Charles Waldman
 Richard Walker
 Larry Wall
+Kevin Walzer
 Greg Ward
 Barry Warsaw
 Steve Waterbury
diff --git a/Misc/NEWS b/Misc/NEWS
index 00350e1..01412c7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@
 Library
 -------
 
+- Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and
+  Cocoa AquaTk.
+
 - Issue #10916: mmap should not segfault when a file is mapped using 0 as
   length and a non-zero offset, and an attempt to read past the end of file
   is made (IndexError is raised instead).  Patch by Ross Lagerwall.