into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  SCCS merged