[pypy-commit] extradoc extradoc: merge conflict?

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: extradoc
Changeset: r4144:0e2c2a1051e7
Date: 2012-03-09 15:13 -0800
http://bitbucket.org/pypy/extradoc/changeset/0e2c2a1051e7/

Log:	merge conflict?