into  shellback.(none):/home/msvensson/mysql/bug15069/my51-bug15069


mysys/Makefile.am:
  Auto merged
mysys/default.c:
  Auto merged