Review request for JDK-8041953

[Marcus Lagergren]

This looks good. I wonder what the original cause of the failure was and if there slipped through any more in this merge or others. However - this looks like it should.

+1

/M

On 28 Apr 2014, at 15:08, Hannes Wallnoefer <hannes.wallnoefer at oracle.com> wrote:

> Please review JDK-8041953: JDK-8031359.js fails in 8u-dev:
> 
> http://cr.openjdk.java.net/~hannesw/8041953/
> 
> This fixes a number of merge errors in JDK-8031359.js fails in 8u-dev.
> 
> Thanks,
> Hannes