I did the merge from 0.8. If you see anything that looks wrong, let me
know. This does seem to produce an impressive flury of emails on the
commits list, one for each change I merged in. Sorry for the spam.

-Jay