Comment 5 for bug 443325

I'm going to hold off on merging this massive commit into karmic right now, as we really must avoid regressions at all costs. I'll go over this commit with Dan tomorrow.

:-Dustin