into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 client/mysqldump.c: Auto merged strings/strtod.c: Auto merged