Slightly updated patch to apply more cleanly. Same changes to files, just changed headers of patch sections.
Slightly updated patch to apply more cleanly. Same changes to files, just changed headers of patch sections.