# HG changeset patch
# User jlaskey
# Date 1380547432 10800
# Node ID 8b92b08993a8ae41b43f0b89aef9a88f11233a15
# Parent  0cc21882d2f63d582b364aa2a8a57b727129362f# Parent  ddf76977d04aa9c90f7809d2201796ee23145721
Merge

diff -r 0cc21882d2f6 -r 8b92b08993a8 common/autoconf/generated-configure.sh
diff -r 0cc21882d2f6 -r 8b92b08993a8 common/autoconf/spec.gmk.in
diff -r 0cc21882d2f6 -r 8b92b08993a8 common/bin/hgforest.sh
diff -r 0cc21882d2f6 -r 8b92b08993a8 common/makefiles/Main.gmk
diff -r 0cc21882d2f6 -r 8b92b08993a8 make/nashorn-rules.gmk