[pypy-svn] pypy commit 9d13100ecc53: 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 1292354669 18000
# Node ID 9d13100ecc5325ae95c437d89dd57c97cc53d562
# Parent  664c214b9d22ba8f74eac5ba8bcbdb1f756490bf
# Parent  4876da3fbd8c9c5ea0e4a256fc0916846d8663f6
Automated merge with https://bitbucket.org/pypy/pypy