Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0

configure.in

@@ -2374,7 +2374,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
 rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
 echo
 echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the"
-echo "latest release, upcoming features and other information to make your"
+echo "latest release, upcoming features, and other information to make your"
 echo "work or play with MySQL more productive. There you can also find"
 echo "information about mailing lists for MySQL discussion."
 echo

mysql-test/install_test_db.sh

@@ -218,6 +218,6 @@ END_OF_DATA
 then
     exit 0
 else
-    echo "Error executing mysqld --boostrap"
+    echo "Error executing mysqld --bootstrap"
     exit 1
 fi