# HG changeset patch
# User jlaskey
# Date 1377630330 10800
# Node ID 96f207364e46e9fc18cf1a8a31bae179b376ed9a
# Parent  163091288aeb2b320d53ae2eadee8621ef87435a# Parent  67dc3d7d5b5f3f1280ab87803cb074b5ddc9cac3
Merge

diff -r 163091288aeb -r 96f207364e46 common/autoconf/generated-configure.sh
diff -r 163091288aeb -r 96f207364e46 common/autoconf/spec.gmk.in
diff -r 163091288aeb -r 96f207364e46 common/bin/hgforest.sh
diff -r 163091288aeb -r 96f207364e46 common/makefiles/Main.gmk
diff -r 163091288aeb -r 96f207364e46 make/nashorn-rules.gmk