# HG changeset patch
# User jlaskey
# Date 1383058080 10800
# Node ID d832f6171acd69b26ad3968240b7d502ed6cbbd0
# Parent  a36df87b3901660ee223ee91e9d7e9fbe328c6fd# Parent  8b92b08993a8ae41b43f0b89aef9a88f11233a15
Merge

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