From: Kurt B. Kaiser <kbk@shore.net>
Date: Tue, 22 Mar 2011 23:26:46 +0000 (-0400)
Subject: Merge from 3.1
X-Git-Tag: v3.2.1b1~218^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01ac8cdc132806f57815822854ba1589b4fc40c3;p=python

Merge from 3.1
---

01ac8cdc132806f57815822854ba1589b4fc40c3
diff --cc Lib/idlelib/NEWS.txt
index 037b02a3c1,7081d8020a..a825dc5f9f
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,7 -1,15 +1,15 @@@
- What's New in IDLE 3.1?
+ What's New in IDLE 3.1.4?
+ =========================
+ 
+ *Release date: XX-XXX-XX*
+ 
+ - <Home> toggle non-functional when NumLock set on Windows.  Issue3851.
+ 
+ 
+ What's New in IDLE 3.1b1?
  =========================
  
 -*Release date: XX-XXX-09*
 +*Release date: 27-Jun-09*
  
  - Use of 'filter' in keybindingDialog.py was causing custom key assignment to
    fail.  Patch 5707 amaury.forgeotdarc.