# HG changeset patch
# User jlaskey
# Date 1366649977 10800
# Node ID dd81e9b5fb3871e57dba7ed4ecfa6ffe8b41e884
# Parent  2600c8d8b619935c6332e1d0725508f3d61ff9cd# Parent  6316aefcf716974e043c2330f1735b71c21979a8
Merge

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