I've checked in my merge of the branch. As per my previous mail, the changes were pretty trivial, so I expect no problems. But consider it official - the branch is dead. Mark.