Comment 87 for bug 727594

Patch posted for inclusion.