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

into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

.bzrignore

@@ -420,3 +420,4 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+Docs/#manual.texi#

BitKeeper/etc/logging_ok

@@ -31,3 +31,5 @@ tonu@hundin.mysql.fi
 tonu@volk.internalnet
 tonu@x153.internalnet
 tonu@x3.internalnet
+Administrator@co3064164-a.
+Administrator@co3064164-a.rochd1.qld.optushome.com.au