[pypy-svn] r43582 - pypy/dist/pypy/annotation/test

[arigo at codespeak.net]

Author: arigo
Date: Wed May 23 17:59:07 2007
New Revision: 43582

Added:
   pypy/dist/pypy/annotation/test/test_annrpython.py.merge.tmp
      - copied, changed from r43580, pypy/dist/pypy/annotation/test/test_annrpython.py
Log:
merging of http://codespeak.net/svn/pypy/branch/prolog-jit-experiments/pypy/annotation/test/test_annrpython.py
revisions 43364 to 43580:

    ------------------------------------------------------------------------
    r43540 | cfbolz | 2007-05-21 18:37:23 +0200 (Mon, 21 May 2007) | 2 lines
    
    move jit-related stuff to its own file in rlib.jit
    
    ------------------------------------------------------------------------
    r43366 | cfbolz | 2007-05-14 15:24:04 +0200 (Mon, 14 May 2007) | 5 lines
    
    Be afraid.  Very afraid.
    
    A branch to experiment with rewriting the Prolog interpreter to make it work
    with the JIT.
    
    ------------------------------------------------------------------------