Comment 18 for bug 658004

I tested the patch before submitting here, if that counts ;)