[pypy-commit] pypy range-immutable: merge default again x2

2011-07-21 Thread fijal
Author: Maciej Fijalkowski Branch: range-immutable Changeset: r45832:a17d21b7ede9 Date: 2011-07-21 18:15 +0200 http://bitbucket.org/pypy/pypy/changeset/a17d21b7ede9/ Log:merge default again x2 diff --git a/pypy/jit/metainterp/test/test_ajit.py b/pypy/jit/metainterp/test/test_ajit.py --- a/p

[pypy-commit] pypy range-immutable: merge default again

2011-07-21 Thread fijal
Author: Maciej Fijalkowski Branch: range-immutable Changeset: r45828:b93130fd5be1 Date: 2011-07-21 17:06 +0200 http://bitbucket.org/pypy/pypy/changeset/b93130fd5be1/ Log:merge default again diff --git a/pypy/objspace/std/dictproxyobject.py b/pypy/objspace/std/dictproxyobject.py --- a/pypy/o