bzr commit into mysql-6.0-backup-merge branch (cbell:2678)

[Chuck Bell]

#At file:///D:/source/bzr/mysql-6.0-backup-merge/

 2678 Chuck Bell	2008-08-27
      Fixed default file that gets clobbered automatically but noone seems to want to
believe it.
modified:
  .bzr-mysql/default.conf

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-08-27 13:05:26 +0000
+++ b/.bzr-mysql/default.conf	2008-08-27 13:06:40 +0000
@@ -1,6 +1,5 @@
-[MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-backup
-post_commit_to = commits@stripped
-post_push_to = commits@stripped
-tree_name = mysql-6.0-backup
--merge
\ No newline at end of file
+[MYSQL]
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-backup
+post_commit_to = commits@stripped
+post_push_to = commits@stripped
+tree_name = mysql-6.0-backup-merge