Comment 31 for bug 904072

Jamie - your patch was pretty close, actually. I started from scratch, just to be doubly sure, and ended up with an identical patch apart from fixes for the test failures you mentioned. The attached diff compares yours to mine.