[pypy-svn] pypy collections-module: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: collections-module
Changeset: r41993:9d3b26aa0df2
Date: 2011-02-15 19:07 +0100
http://bitbucket.org/pypy/pypy/changeset/9d3b26aa0df2/

Log:	merge heads