Comment 41 for bug 545307

We'll follow the upstream bug and backport any accepted patches