[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r66841:b9216461865e
Date: 2013-09-07 19:17 +0200
http://bitbucket.org/pypy/pypy/changeset/b9216461865e/

Log:	merge heads

diff --git a/lib_pypy/_tkinter/tklib.py b/lib_pypy/_tkinter/tklib.py
--- a/lib_pypy/_tkinter/tklib.py
+++ b/lib_pypy/_tkinter/tklib.py
@@ -110,8 +110,8 @@
     linklibs = ['tk85', 'tcl85']
     libdirs = ['/usr/local/lib', '/usr/X11R6/lib']
 else:
-    incdirs=['/usr/include/tcl'],
-    linklibs=['tcl', 'tk'],
+    incdirs=['/usr/include/tcl']
+    linklibs=['tcl', 'tk']
     libdirs = []
 
 tklib = tkffi.verify("""
diff --git a/rpython/rlib/rstring.py b/rpython/rlib/rstring.py
--- a/rpython/rlib/rstring.py
+++ b/rpython/rlib/rstring.py
@@ -149,6 +149,7 @@
 
 
 @specialize.argtype(0)
+ at jit.elidable
 def replace(input, sub, by, maxsplit=-1):
     if isinstance(input, str):
         assert isinstance(sub, str)