Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/M50/merge-5.0

extra/comp_err.c

@@ -876,9 +876,10 @@ static void usage(void)
 {
   DBUG_ENTER("usage");
   print_version();
-  printf("This software comes with ABSOLUTELY NO WARRANTY. This is free "
-	 "software,\nand you are welcome to modify and redistribute it under "
-	 "the GPL license\nUsage:\n");
+  printf("This software comes with ABSOLUTELY NO WARRANTY. "
+         "This is free software,\n"
+         "and you are welcome to modify and redistribute it under the GPL license.\n"
+         "Usage:\n");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
   DBUG_VOID_RETURN;

scripts/mysqld_multi.sh

@@ -763,9 +763,6 @@ sub usage
   print <<EOF;
 $my_progname version $VER by Jani Tolonen
 
-This software comes with ABSOLUTELY NO WARRANTY. This is free software,
-and you are welcome to modify and redistribute it under the GPL license.
-
 Description:
 $my_progname can be used to start, or stop any number of separate
 mysqld processes running in different TCP/IP ports and UNIX sockets.