Updated as of yesterday's CVS. As always, you'll need to blow away your working copy I haven't had time to move the hooks from dberlin.org's repo to the new repo yet.