13:35 adamw 

Fix build and clean up, mostly by renaming patches.

Interestingly, the build failure and one of the sed commands in the post-patch
target were both due to problems introduced by one of the patches.