webrev: http://cr.openjdk.java.net/~dholmes/7022386/webrev/
This is a very simple forward-port of a change that already went into 6u23.Please cc me as I'm not on the net-dev list (which probably means this will get held up for approval :( )
Thanks, David
