into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


configure.in:
  Auto merged
ndb/src/Makefile.am:
  Auto merged