Patch fixing 3.3 bug PR 9745 and PR 10021

[Jim Wilson]

On Thu, 2003-07-10 at 09:18, Mark Mitchell wrote:
> I concur -- Jim, please apply the patch and close those PRs which are
> indeed fixed.

I've added the patch to mainline and the 3.3 branch.

This fixes 9745, but not 10021 nor 11319.  I will keep plugging away on
this as time permits, trying to find patches for the other two that are
acceptable to everyone.

Jim