# HG changeset patch
# User jlaskey
# Date 1368533042 10800
# Node ID 77ad811cb2ec42f9a219984cb445cffb9fd17b46
# Parent  c092c33b7da61c92539ee73d2bf18b212fa4c793# Parent  88400c3fa84e098e84589f22779fcafd725f973f
Merge

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