request for review (XS)

[Keith McGuigan]

Hello,

This is a forward port of the jdk6 bugfix for 6659215:

webrev: http://cr.openjdk.java.net/~kamg/6659215/webrev.00/

Thanks for any review!

--
- Keith