[pypy-commit] pypy stmgc-c7: hg merge release-2.5.x (from 2.5.1)

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r76418:746681435f00
Date: 2015-03-16 18:34 +0100
http://bitbucket.org/pypy/pypy/changeset/746681435f00/

Log:	hg merge release-2.5.x (from 2.5.1)

diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py
--- a/lib_pypy/_tkinter/app.py
+++ b/lib_pypy/_tkinter/app.py
@@ -96,7 +96,7 @@
 
         if not self.threaded:
             # TCL is not thread-safe, calls needs to be serialized.
-            self._tcl_lock = threading.Lock()
+            self._tcl_lock = threading.RLock()
         else:
             self._tcl_lock = _DummyLock()
 
diff --git a/pypy/doc/release-2.5.1.rst b/pypy/doc/release-2.5.1.rst
--- a/pypy/doc/release-2.5.1.rst
+++ b/pypy/doc/release-2.5.1.rst
@@ -1,8 +1,8 @@
-==============================
-PyPy 2.5.1 - Hakea Hookeriana
-==============================
+================================
+PyPy 2.5.1 - Pineapple Bromeliad
+================================
 
-We're pleased to announce PyPy 2.5.1, following on the heels of 2.5.0
+We're pleased to announce PyPy 2.5.1, Pineapple `Bromeliad`_ following on the heels of 2.5.0
 
 You can download the PyPy 2.5.1 release here:
 
@@ -24,6 +24,7 @@
 * `NumPy`_ which requires installation of our fork of upstream numpy,
   available `on bitbucket`_
 
+.. _`Bromeliad`: http://xkcd.com/1498
 .. _`Py3k`: http://pypy.org/py3donate.html
 .. _`STM`: http://pypy.org/tmdonate2.html
 .. _`NumPy`: http://pypy.org/numpydonate.html