into  trift2.:/MySQL/M51/netware2-5.1


netware/BUILD/compile-netware-END:
  Auto merged
netware/Makefile.am:
  Manual merge.