[haste]

zork, are you able to post your changes as a git format-patch (or diff)? That would allow me to commit the changes in your name. If it's too much hassle, let me know and I'll merge the changes in manually.