cd9a2f5c28
really want them) from /usr/src. This is the final version of the patches, incorporating the feedback I've received from -current.