Comment 23 for bug 321281

Upstream has a patch they've committed against trunk. In cooperation with upstream, I have been testing the patch for the better part of the week. It fixes the bug and has no known regressions. We definitely should get this in for 10.04.