[pypy-svn] pypy pytest2: merge default

[hpk42]

Author: holger krekel <holger at merlinux.eu>
Branch: pytest2
Changeset: r42470:a9e3fe42b354
Date: 2011-03-08 09:52 +0100
http://bitbucket.org/pypy/pypy/changeset/a9e3fe42b354/

Log:	merge default