[MERGE][0.15] Fix for: Re: bzr selftest fails: ERROR: test_generate_docs.TestGenerateDocs.test_man_page

[John Arbash Meinel]

John Arbash Meinel has voted +1 (conditional).
Status is now: Conditionally approved
Comment:
Seems reasonable. My only question is if the TODO needs to stay, 
considering we have a texwrap() call.


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3Cesadlb%24lso%241%40sea.gmane.org%3E