merge with mainline

tests/util/grub-shell-tester.in

@@ -1,4 +1,4 @@
-#! /bin/bash -e
+#! /bin/sh -e
 
 # Compares GRUB script output with BASH output.
 # Copyright (C) 2009,2010  Free Software Foundation, Inc.
@@ -84,7 +84,7 @@ done
 
 if [ "x${source}" = x ] ; then
   tmpfile=`mktemp`
-  while read; do
+  while read REPLY; do
     echo $REPLY >> ${tmpfile}
   done
   source=${tmpfile}