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


storage/ndb/src/Makefile.am:
  Auto merged
configure.in:
  Too many changes to merge. Leaving the local version. Will add soname changes by hand. 
  .