[pypy-svn] pypy commit e5b73981fc8d: merge heads

[Bitbucket]

# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Antonio Cuni <anto.cuni at gmail.com>
# Date 1292263273 -3600
# Node ID e5b73981fc8d5cd14074426b0e439f0716379a31
# Parent  74bbe61137d921345adafcb80d004ce7d8860ace
# Parent  85b74c8de1c96027c19741ddac3fb967390d7235
merge heads