# HG changeset patch
# User jlaskey
# Date 1366199227 10800
# Node ID 6316aefcf716974e043c2330f1735b71c21979a8
# Parent  b95c5c8ee60a7eadc8eb85408faffea1761c2685# Parent  8a7e9784847184fc772d9029ed705f750c2d65bb
Merge

diff -r b95c5c8ee60a -r 6316aefcf716 common/autoconf/generated-configure.sh
diff -r b95c5c8ee60a -r 6316aefcf716 common/autoconf/spec.gmk.in
diff -r b95c5c8ee60a -r 6316aefcf716 common/bin/hgforest.sh
diff -r b95c5c8ee60a -r 6316aefcf716 common/makefiles/Main.gmk
diff -r b95c5c8ee60a -r 6316aefcf716 make/nashorn-rules.gmk