I did submit this on Friday, but it was not accepted for some reason. I've resubmitted it to trunk and also to the 1.7 branch. (Which I hope is ok with John; he did ok it before 1.7rc1 which I realize is a bit different.) -- Martin <http://launchpad.net/~mbp/>