# HG changeset patch
# User jlaskey
# Date 1365507331 10800
# Node ID 1378ccca1c79f884707fc56b16090b34d14251f7
# Parent  11c057460b9123da19b166fc2a454793fd4dca32# Parent  fe5a388bf8fe0fd51b0820564e79a969baf99a8a
Merge

diff -r 11c057460b91 -r 1378ccca1c79 common/autoconf/generated-configure.sh
diff -r 11c057460b91 -r 1378ccca1c79 common/autoconf/spec.gmk.in
diff -r 11c057460b91 -r 1378ccca1c79 common/bin/hgforest.sh
diff -r 11c057460b91 -r 1378ccca1c79 common/makefiles/Main.gmk
diff -r 11c057460b91 -r 1378ccca1c79 make/nashorn-rules.gmk