# HG changeset patch
# User jlaskey
# Date 1363359023 10800
# Node ID d9aff84aa2b4b8093521604c89d7e710f2197d7a
# Parent  50dd9873864108a77fb244cdeab5d585f7c7f160# Parent  a195c16402bc2f407262df516269a349d1fd4ee3
Merge

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