into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged