Try this again with all the changes.
The alternative proposed was to carry patches in a contrib directory and that didn't
really sound any better to me, and also sounded like more work.
--
To view this pull request on github, visit
https://github.com/rhinstaller/anaconda/pull/328