into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint configure.in: Auto merged mysql-test/r/range.result: Auto merged sql/item.cc: Auto merged