# HG changeset patch
# User jlaskey
# Date 1364299980 10800
# Node ID fe5a388bf8fe0fd51b0820564e79a969baf99a8a
# Parent  4984ac509993322f86a80ff3289b627beec6602a# Parent  b938d5ee29c36dfa3a46a4f90c8ff60eb1252fbd
Merge

diff -r 4984ac509993 -r fe5a388bf8fe common/autoconf/generated-configure.sh
diff -r 4984ac509993 -r fe5a388bf8fe common/autoconf/spec.gmk.in
diff -r 4984ac509993 -r fe5a388bf8fe common/bin/hgforest.sh
diff -r 4984ac509993 -r fe5a388bf8fe common/makefiles/Main.gmk
diff -r 4984ac509993 -r fe5a388bf8fe make/nashorn-rules.gmk