Comment 145 for bug 337314

If the patch has been tested and is known to work, then I'll send this upstream, unless of course Alex has done that already...