# HG changeset patch
# User jlaskey
# Date 1362768271 14400
# Node ID 1d38d30196bee2fc9493e2c3d81c335142c0616a
# Parent  b35d986ff2760a6b3b6393b549560250f46e84da# Parent  13ddc5c3ebfc2baa50c94d1b9485e5a9cdd69bf4
Merge

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