hg: jdk9/sandbox/nashorn: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: fa5a02c96c6f
Author:    ihse
Date:      2015-03-24 16:40 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/fa5a02c96c6f

Merge

- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/resources/shell.js