Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

Docs/manual.texi:
  Auto merged

BitKeeper/etc/logging_ok

@@ -3,3 +3,4 @@ monty@hundin.mysql.fi
 mwagner@evoq.mwagner.org
 heikki@donna.mysql.fi
 sasha@mysql.sashanet.com
+paul@central.snake.net

Docs/manual.texi

@@ -45475,7 +45475,7 @@ Active mailing list member.
 Ported (and extended) the benchmark suite to @code{DBI}/@code{DBD}. Have
 been of great help with @code{crash-me} and running benchmarks. Some new
 date functions. The mysql_setpermissions script.
-@item Jay Flaherty @email{fty@@utk.edu}
+@item Jay Flaherty @email{fty@@mediapulse.com}
 Big parts of the Perl @code{DBI}/@code{DBD} section in the manual.
 @item Paul Southworth @email{pauls@@etext.org}, Ray Loyzaga @email{yar@@cs.su.oz.au}
 Proof-reading of the Reference Manual.