# HG changeset patch
# User jlaskey
# Date 1366023994 10800
# Node ID 8a7e9784847184fc772d9029ed705f750c2d65bb
# Parent  7da551071fe89a6523bc07ac528b08e6e22f45c3# Parent  1378ccca1c79f884707fc56b16090b34d14251f7
Merge

diff -r 7da551071fe8 -r 8a7e97848471 common/autoconf/generated-configure.sh
diff -r 7da551071fe8 -r 8a7e97848471 common/autoconf/spec.gmk.in
diff -r 7da551071fe8 -r 8a7e97848471 common/bin/hgforest.sh
diff -r 7da551071fe8 -r 8a7e97848471 common/makefiles/Main.gmk
diff -r 7da551071fe8 -r 8a7e97848471 make/nashorn-rules.gmk