# HG changeset patch
# User ohair
# Date 1215557191 25200
# Node ID b21425229e0b1a143b676b4d3f9b09e122afcb3c
# Parent  17c572e2697c08054a27263fe14f8e0f946752fe# Parent  551f4309f4762090b0ec1050e8eccd45aed6505a
Merge

diff -r 551f4309f476 -r b21425229e0b make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make	Thu Jul 03 10:46:50 2008 -0700
+++ b/make/linux/makefiles/buildtree.make	Tue Jul 08 15:46:31 2008 -0700
@@ -335,7 +335,7 @@
 	$(BUILDTREE_COMMENT); \
 	echo '. ./env.sh'; \
 	echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
-	echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>1 > /dev/null"; \
+	echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
 	echo "then"; \
 	echo "  $(WRONG_DATA_MODE_MSG); exit 0;"; \
 	echo "fi"; \