into  zim.(none):/home/brian/mysql/archive-format-5.1


storage/archive/Makefile.am:
  Auto merged
storage/archive/archive_test.c:
  Auto merged
storage/archive/azio.c:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/archive/ha_archive.cc:
  Merge