Backport of S6795356

[Denis Lila]

> This is the one we discussed right?

That's right. 

>  What's S7004655?  From bugs.sun.com, it seems
> to be at the stage 1 with no fix.

S7004655 is a sun.bugs counterpart of PR590 I filed before
I knew about 6795356.

> If the enclosed patch is the contents of the changeset for 6795356,
> the file should
> be named appropriately.

Should I include both bugids in the name?