Bug#932584: Epydoc and Pydoctor

[Kenneth Pronovici]

I decided to NMU and uploaded a few days ago, so things are in good shape
now, I think.  You can integrate my changes whenever you have time.  Thanks
for confirming that your ok with the NMU.  I was hoping you would be.

KEN