[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r83408:9a18329069c4
Date: 2016-03-27 22:59 +0200
http://bitbucket.org/pypy/pypy/changeset/9a18329069c4/

Log:	merge heads

diff --git a/rpython/jit/backend/arm/detect.py b/rpython/jit/backend/arm/detect.py
--- a/rpython/jit/backend/arm/detect.py
+++ b/rpython/jit/backend/arm/detect.py
@@ -80,7 +80,7 @@
 
     i = 0
     while i <= buf_size - struct_size:
-        if buf[i] == 0:
+        if buf[i] == '\x00':
             i += 1
             continue