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


client/mysqltest.c:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged