[pypy-svn] pypy commit 51b2dc8ba40b: 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 1292324441 -3600
# Node ID 51b2dc8ba40bcb2ae4cc9a23e5016e3c928c595d
# Parent  63d2c6f712c224253be400c4e41db00657350b73
# Parent  8c19e0ff3e45f1830755d008b19c680d88e7d714
merge heads