# HG changeset patch
# User jlaskey
# Date 1369313290 10800
# Node ID 67b5cbe55744a62c8bbcbf574d3a79480e7086fb
# Parent  40bba0507f76bb90948a0a31126735be07190729# Parent  1fca390200c146d31195a27ed4d7f7297efbe5e9
Merge

diff -r 40bba0507f76 -r 67b5cbe55744 common/autoconf/generated-configure.sh
diff -r 40bba0507f76 -r 67b5cbe55744 common/autoconf/spec.gmk.in
diff -r 40bba0507f76 -r 67b5cbe55744 common/bin/hgforest.sh
diff -r 40bba0507f76 -r 67b5cbe55744 common/makefiles/Main.gmk
diff -r 40bba0507f76 -r 67b5cbe55744 make/nashorn-rules.gmk