# HG changeset patch
# User jlaskey
# Date 1380547432 10800
# Node ID dff705332bda6c501d3f3607c136e723f042091f
# Parent  854eee8ce543d9d8980c80ee51b6341342c3f0d3# Parent  5f450c98c6fb4eb0e33490d8e4289b863b20715d
Merge

diff -r 854eee8ce543 -r dff705332bda common/autoconf/generated-configure.sh
diff -r 854eee8ce543 -r dff705332bda common/autoconf/spec.gmk.in
diff -r 854eee8ce543 -r dff705332bda common/bin/hgforest.sh
diff -r 854eee8ce543 -r dff705332bda common/makefiles/Main.gmk
diff -r 854eee8ce543 -r dff705332bda make/nashorn-rules.gmk