[pypy-commit] pypy win64_gborg: merge

[ctismer]

Author: Christian Tismer <tismer at stackless.com>
Branch: win64_gborg
Changeset: r48957:8b324f7ce7a9
Date: 2011-11-08 17:21 +0100
http://bitbucket.org/pypy/pypy/changeset/8b324f7ce7a9/

Log:	merge