into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


extra/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged