Comment 6 for bug 612082

Assigning bug to me, since I've attached a fix.

I'm not sure who to ask for code-review from (if needed) or how to get the patch committed, though -- Soren, could you perhaps help with either of those?