into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysys/my_static.c:
  Auto merged
mysys/mf_tempfile.c:
  Use remote