Bump to latest patchlevel

Hi,

I cooked up some of my own scripts to merge from the upstream hg repo. I'm not sure how you normally do it, I didn't get any common commits with you, so I just rebased from the last patch you included onwards.

Also, this has some bugs. I've been unable to track them all down so far. I also borked some of the merge conflicts, I'll rerun and get them all right before I ask you to merge, before that I'm really just asking for comment on this, and whether or not you might share how you normally do a pull from upstream in case there's a simpler way.