# HG changeset patch
# User jlaskey
# Date 1365507331 10800
# Node ID 81fda7dbde35fbc5440eb67cb924b9c78d0aa37b
# Parent  cfe39a8ba9089597d8919f3e33119e578fda45b3# Parent  0ea2ced96d3e7d3e6961ff2951bf6689b74dc9f1
Merge

diff -r cfe39a8ba908 -r 81fda7dbde35 common/autoconf/generated-configure.sh
diff -r cfe39a8ba908 -r 81fda7dbde35 common/autoconf/spec.gmk.in
diff -r cfe39a8ba908 -r 81fda7dbde35 common/bin/hgforest.sh
diff -r cfe39a8ba908 -r 81fda7dbde35 common/makefiles/Main.gmk
diff -r cfe39a8ba908 -r 81fda7dbde35 make/nashorn-rules.gmk