Comment 8 for bug 907056

Since this branch does rebase cleanly on master. I'm going to leave the rebase to someone who knows more about what this branch is supposed to do. After its rebased, I'll be happy to check it out again and give it a test run. It seems to work so far on my development machine.