Comment 1 for bug 804018

There's some bugs in the branch I published that I'm trying to fix now. I've retracted my proposal to merge in the mean time. I'm sorry that I asked for a review too soon; I hope you haven't spent too much time on it yet.

I will send a new review request when I've fixed it.