# HG changeset patch
# User jlaskey
# Date 1364299980 10800
# Node ID 0ea2ced96d3e7d3e6961ff2951bf6689b74dc9f1
# Parent  0fe6f1afaf7cb1b64917cfea1850334cb3bb6708# Parent  d9aff84aa2b4b8093521604c89d7e710f2197d7a
Merge

diff -r 0fe6f1afaf7c -r 0ea2ced96d3e common/autoconf/generated-configure.sh
diff -r 0fe6f1afaf7c -r 0ea2ced96d3e common/autoconf/spec.gmk.in
diff -r 0fe6f1afaf7c -r 0ea2ced96d3e common/bin/hgforest.sh
diff -r 0fe6f1afaf7c -r 0ea2ced96d3e common/makefiles/Main.gmk
diff -r 0fe6f1afaf7c -r 0ea2ced96d3e make/nashorn-rules.gmk