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


mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged