Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
unknown authored
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
0abbe209