[pypy-svn] pypy commit a1c814b57c3b: Automated merge with https://bitbucket.org/pypy/pypy

[Bitbucket]

# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Alex Gaynor <alex.gaynor at gmail.com>
# Date 1292323702 18000
# Node ID a1c814b57c3b91f0000802d2ba13361a44908625
# Parent  58f56bdf5c4bf4ca311b0f6a794ed8a79a1a85a8
# Parent  55903b1dd06be55352a1988cf48a6baf7ba994e0
Automated merge with https://bitbucket.org/pypy/pypy