[pypy-svn] pypy jit-virtual_state: hg merge default

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-virtual_state
Changeset: r41797:4e6f0f9ef69f
Date: 2011-02-10 19:20 +0100
http://bitbucket.org/pypy/pypy/changeset/4e6f0f9ef69f/

Log:	hg merge default