into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-19725


sql/sp_head.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  using 5.1's version, will merge by hand after running the new test
mysql-test/t/rpl_sp.test:
  using 5.1's version, will re-insert the new test portion by hand