into  rama.(none):/home/jimw/my/mysql-5.1-clean


mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged