[pypy-svn] pypy commit 655ca5f1175c: merge heads

[Bitbucket]

# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Amaury Forgeot d'Arc <amauryfa at gmail.com>
# Date 1292369372 -3600
# Node ID 655ca5f1175cb92ed5fe95bc21ea0c87b691a693
# Parent  fe4caca45d2e17762851d46a6a07fefa06995894
# Parent  3d945db3432096664fe1cf75d71b7063bd630c3d
merge heads