[pypy-svn] pypy arm-backend-2: merge default

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: arm-backend-2
Changeset: r41550:e7af2d652594
Date: 2011-01-25 16:27 +0100
http://bitbucket.org/pypy/pypy/changeset/e7af2d652594/

Log:	merge default

diff --git a/pypy/jit/tl/pypyjit.py b/pypy/jit/tl/pypyjit.py
--- a/pypy/jit/tl/pypyjit.py
+++ b/pypy/jit/tl/pypyjit.py
@@ -30,7 +30,7 @@
     BACKEND = 'c'
 
 config = get_pypy_config(translating=True)
-config.translation.backendopt.inline_threshold = 0
+config.translation.backendopt.inline_threshold = 0.1
 config.translation.gc = 'boehm'
 config.objspace.nofaking = True
 config.translating = True

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -60,3 +60,4 @@
 ^pypy/doc/image/lattice3\.png$
 ^pypy/doc/image/stackless_informal\.png$
 ^pypy/doc/image/parsing_example.+\.png$
+^compiled
\ No newline at end of file