[pypy-svn] r44291 - pypy/dist/pypy/annotation

[arigo at codespeak.net]

Author: arigo
Date: Fri Jun 15 15:54:13 2007
New Revision: 44291

Added:
   pypy/dist/pypy/annotation/builtin.py.merge.tmp
      - copied, changed from r44288, pypy/dist/pypy/annotation/builtin.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/kill-ctypes/pypy/annotation/builtin.py
revisions 43433 to 44288:

    ------------------------------------------------------------------------
    r44052 | fijal | 2007-06-06 15:37:21 +0200 (Wed, 06 Jun 2007) | 2 lines
    
    force termios.error to be of a certain shape
    
    ------------------------------------------------------------------------
    r43437 | fijal | 2007-05-16 21:15:04 +0200 (Wed, 16 May 2007) | 3 lines
    
    A branch which tries to create pypy without ctypes dependency,
    by approaching external functions via ll objects
    
    ------------------------------------------------------------------------