[pypy-svn] pypy commit e7bff972e4ad: 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 1292358273 18000
# Node ID e7bff972e4ad3dcb64457adc95d28e7dab38d391
# Parent  0c24ef1bebbca0d3da1083c4c5672487f8e5e7b1
# Parent  9d13100ecc5325ae95c437d89dd57c97cc53d562
Automated merge with https://bitbucket.org/pypy/pypy