Comment 1 for bug 803121

The branch has been rebased to master as of 2011-06-30 11:49 EDT (-0400) and squashed to a single commit.

Elses have been given some love and cuddled.

I've tested it somewhat and it seems to work. I think others ought to test it before it goes into master. I'm still waiting on some of my consortium members who said that they could test it.