04b08adf06
Ported Chris Phillips' patch from jdk5 to jdk7 Reviewed-by: chrisphi, coleenp
Ported Chris Phillips' patch from jdk5 to jdk7 Reviewed-by: chrisphi, coleenp