[pypy-svn] extradoc extradoc: Merged upstream.

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: extradoc
Changeset: r3366:2c7f1e0d17ce
Date: 2011-03-10 09:07 -0500
http://bitbucket.org/pypy/extradoc/changeset/2c7f1e0d17ce/

Log:	Merged upstream.