# HG changeset patch
# User jlaskey
# Date 1362768271 14400
# Node ID a195c16402bc2f407262df516269a349d1fd4ee3
# Parent  e57109801d9ca691c9dc0b4724c0503fcbd0e05c# Parent  7a0479f63dcd638b5fac413bc85cd3cc5b43be43
Merge

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