# HG changeset patch
# User jlaskey
# Date 1367282245 10800
# Node ID 431d16ddfcd9bef982fe2045df9221020340b8d1
# Parent  f171aa801ea52665aeb02ec178e19719430ef3f4# Parent  dd81e9b5fb3871e57dba7ed4ecfa6ffe8b41e884
Merge

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