into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint extra/yassl/src/ssl.cpp: Auto merged sql/log.cc: Auto merged