into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint BitKeeper/etc/ignore: auto-union mysql-test/mysql-test-run.pl: Auto merged