BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Merged in example storage engine with NDB
configure.in:
  Resolved conflict between NDB check with EXAMPLE DB.