As per bug 6779, this patch is now applied to trunk; while I was at it, I corrected...