Conflict resolved.
[platform/upstream/rpm.git] / db / dbinc / xa.h
2002-08-14 jbjInitial revision