[pypy-svn] r67683 - pypy/trunk/pypy/jit/metainterp/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Sep 14 16:50:40 2009
New Revision: 67683

Added:
   pypy/trunk/pypy/jit/metainterp/test/test_basic.py.merge.tmp
      - copied unchanged from r67674, pypy/trunk/pypy/jit/metainterp/test/test_basic.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/spine-of-frames/pypy/jit/metainterp/test/test_basic.py
revisions 67428 to 67674:

    ------------------------------------------------------------------------
    r67624 | cfbolz | 2009-09-10 16:45:13 +0200 (Thu, 10 Sep 2009) | 2 lines
    
    merge in changes from revisions r67429 through r67623 of trunk.
    
    ------------------------------------------------------------------------
    r67429 | cfbolz | 2009-09-02 15:32:28 +0200 (Wed, 02 Sep 2009) | 2 lines
    
    a branch where to try to link frames together differently
    
    ------------------------------------------------------------------------