[Python-checkins] cpython (merge default -> default): merge heads

[sandro.tosi]

http://hg.python.org/cpython/rev/4805f24ba269
changeset:   76024:4805f24ba269
parent:      76023:40ed19ed0342
parent:      76019:d2b6d821934a
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sat Mar 31 18:46:45 2012 +0200
summary:
  merge heads

files:
  Misc/NEWS |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,7 +37,7 @@
 Library
 -------
 
-- Issue #5136: deprecated old, unused functions from tkinter.
+- Issue #5136: deprecate old, unused functions from tkinter.
 
 - Issue #14409: IDLE now properly executes commands in the Shell window
   when it cannot read the normal config files on startup and

-- 
Repository URL: http://hg.python.org/cpython