From 6d6bd4436a08e557cc7cb52d6ae26f8662063f50 Mon Sep 17 00:00:00 2001
From: Nick Coghlan <ncoghlan@gmail.com>
Date: Tue, 15 Jul 2008 15:40:22 +0000
Subject: [PATCH] Add missing NEWS entry for r64962

---
 Misc/NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Misc/NEWS b/Misc/NEWS
index e29a9b07901..24f337eb14b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,13 @@ What's New in Python 2.6 beta 2?
 Core and Builtins
 -----------------
 
+- Issue #2235: __hash__ is once again inherited by default. To allow
+  collections.Hashable to remain meaningful in the presence of the
+  default hash implementation (object.__hash__), it is now possible
+  to explicit block inheritance of hash by setting __hash__=None at
+  the Python level, or tp_hash=PyObject_HashNotImplemented at the C
+  level.
+
 - Issue #3221: Issue a RuntimeWarning instead of raising SystemError if
   the parent module cannot be found while performing an absolute import.
   This means that an incorrectly defined __package__ attribute will